Refactor doom/reload-autoloads

This commit is contained in:
Henrik Lissner 2017-02-13 04:50:04 -05:00
parent 14967f084a
commit 24ca2a4163

View file

@ -352,8 +352,7 @@ the commandline."
(interactive) (interactive)
(doom-initialize-packages noninteractive) (doom-initialize-packages noninteractive)
(let ((generated-autoload-file doom-autoload-file) (let ((generated-autoload-file doom-autoload-file)
autoload-files) (autoload-files
(setq autoload-files
(append (-flatten (--map (let ((auto-dir (f-expand "autoload" it)) (append (-flatten (--map (let ((auto-dir (f-expand "autoload" it))
(auto-file (f-expand "autoload.el" it))) (auto-file (f-expand "autoload.el" it)))
(append (and (f-exists-p auto-file) (append (and (f-exists-p auto-file)
@ -362,12 +361,13 @@ the commandline."
(f-glob "*.el" auto-dir)))) (f-glob "*.el" auto-dir))))
(--map (doom-module-path (car it) (cdr it)) (--map (doom-module-path (car it) (cdr it))
(doom--module-pairs)))) (doom--module-pairs))))
(f-glob "autoload/*.el" doom-core-dir))) (f-glob "autoload/*.el" doom-core-dir))))
(when (f-exists-p generated-autoload-file) (when (f-exists-p generated-autoload-file)
(f-delete generated-autoload-file) (f-delete generated-autoload-file)
(message "Deleted old autoloads.el")) (message "Deleted old autoloads.el"))
(dolist (file autoload-files) (dolist (file autoload-files)
(@quiet (update-file-autoloads file)) (let ((inhibit-message t))
(update-file-autoloads file))
(message "Scanned %s" (f-relative file doom-emacs-dir))) (message "Scanned %s" (f-relative file doom-emacs-dir)))
(condition-case ex (condition-case ex
(with-current-buffer (get-file-buffer generated-autoload-file) (with-current-buffer (get-file-buffer generated-autoload-file)