emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor autoloads init in doom-initialize

Browse source 
Simplify doom-initialize-autoloads
This commit is contained in:
Henrik Lissner 2018-06-10 17:13:20 +02:00
parent ee154911ae
commit 88f1ae3797
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/autoload/modules.el
View file

@ -62,17 +62,6 @@ one wants that.")
short-name short-name
(car ex) (error-message-string ex)))))) (car ex) (error-message-string ex))))))
;;;###autoload
(defun doom-delete-autoloads-file (file)
"Delete FILE (an autoloads file), and delete the accompanying *.elc file, if
it exists."
(or (stringp file)
(signal 'wrong-type-argument (list 'stringp file)))
(when (file-exists-p file)
(delete-file file)
(ignore-errors (delete-file (byte-compile-dest-file file)))
(print! "Deleted old %s" (file-name-nondirectory file))))
;;;###autoload ;;;###autoload
(defun doom//reload-autoloads (&optional file force-p) (defun doom//reload-autoloads (&optional file force-p)
"Reloads FILE (an autoload file), if it needs reloading. "Reloads FILE (an autoload file), if it needs reloading.

29
core/core-packages.el
View file

@ -228,6 +228,15 @@ If RETURN-P, return the message as a string instead of displaying it."
(unless (file-directory-p dir) (unless (file-directory-p dir)
(make-directory dir t)))) (make-directory dir t))))
(defun doom-delete-autoloads-file (file)
"Delete FILE (an autoloads file), and delete the accompanying *.elc file, if
it exists."
(cl-check-type file string)
(when (file-exists-p file)
(delete-file file)
(ignore-errors (delete-file (byte-compile-dest-file file)))
(message "Deleted old %s" (file-name-nondirectory file))))
;; ;;
;; Bootstrap API ;; Bootstrap API
@ -267,10 +276,15 @@ to least)."
(when (or force-p (not doom-init-p)) (when (or force-p (not doom-init-p))
;; Set this to prevent infinite recursive calls to `doom-initialize' ;; Set this to prevent infinite recursive calls to `doom-initialize'
(setq doom-init-p t) (setq doom-init-p t)
;; Delete autoloads file so we can regenerate them later.
(when force-p
(mapc #'doom-delete-autoloads-file
(list doom-autoload-file
doom-package-autoload-file)))
;; `doom-autoload-file' tells Emacs where to load all its autoloaded ;; `doom-autoload-file' tells Emacs where to load all its autoloaded
;; functions from. This includes everything in core/autoload/*.el and all ;; functions from. This includes everything in core/autoload/*.el and all
;; the autoload files in your enabled modules. ;; the autoload files in your enabled modules.
(unless (doom-initialize-autoloads doom-autoload-file force-p) (unless (doom-initialize-autoloads doom-autoload-file)
(doom-ensure-core-directories) (doom-ensure-core-directories)
(doom-ensure-same-emacs-version-p) (doom-ensure-same-emacs-version-p)
(doom-ensure-packages-initialized force-p) (doom-ensure-packages-initialized force-p)
@ -309,13 +323,12 @@ non-nil."
'noerror 'nomessage)))) 'noerror 'nomessage))))
(defun doom-initialize-autoloads (file) (defun doom-initialize-autoloads (file)
"Tries to load FILE (an autoloads file)." "Tries to load FILE (an autoloads file). Return t on success, nil otherwise."
(unless clear-p (condition-case-unless-debug e
(condition-case-unless-debug e (load (file-name-sans-extension file) 'noerror 'nomessage)
(load (file-name-sans-extension file) 'noerror 'nomessage) ('error
('error (message "Autoload error: %s -> %s"
(message "Autoload error: %s -> %s" (car e) (error-message-string e)))))
(car e) (error-message-string e))))))
(defun doom-initialize-packages (&optional force-p) (defun doom-initialize-packages (&optional force-p)
"Ensures that Doom's package management system, package.el and quelpa are "Ensures that Doom's package management system, package.el and quelpa are