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

core-packages: minor refactor of load! & def-package!

Browse source
This commit is contained in:
Henrik Lissner 2017-12-28 19:15:50 -05:00
parent 5789fb4511
commit a811c7ff12
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/core-packages.el
View file

@ -325,7 +325,7 @@ MODULES is an malformed plist of modules to load."
;; Ignore package if NAME is in `doom-disabled-packages' ;; Ignore package if NAME is in `doom-disabled-packages'
(when (and (memq name doom-disabled-packages) (when (and (memq name doom-disabled-packages)
(not (memq :disabled plist))) (not (memq :disabled plist)))
(setq plist (append (list :disabled t) plist))) (setq plist `(:disabled t ,@plist)))
;; If byte-compiling, ignore this package if it doesn't meet the condition. ;; If byte-compiling, ignore this package if it doesn't meet the condition.
;; This avoids false-positive load errors. ;; This avoids false-positive load errors.
(unless (and (bound-and-true-p byte-compile-current-file) (unless (and (bound-and-true-p byte-compile-current-file)
@ -368,31 +368,26 @@ to have them return non-nil (or exploit that to overwrite Doom's config)."
"Load a file relative to the current executing file (`load-file-name'). "Load a file relative to the current executing file (`load-file-name').
FILESYM is either a symbol or string representing the file to load. PATH is FILESYM is either a symbol or string representing the file to load. PATH is
where to look for the file (a string representing a directory path), by default where to look for the file (a string representing a directory path). If omitted,
it is relative to `load-file-name', `byte-compile-current-file' or the lookup is relative to `load-file-name', `byte-compile-current-file' or
`buffer-file-name' (in that order). `buffer-file-name' (in that order).
If NOERROR is non-nil, don't throw an error if the file doesn't exist." If NOERROR is non-nil, don't throw an error if the file doesn't exist."
(let ((path (or (and path (or (and (symbolp path) (symbol-value path)) (cl-assert (symbolp filesym) t)
(and (stringp path) path) (let ((path (or path
(and (listp path) (eval path))))
(and load-file-name (file-name-directory load-file-name)) (and load-file-name (file-name-directory load-file-name))
(and (bound-and-true-p byte-compile-current-file) (and (bound-and-true-p byte-compile-current-file)
(file-name-directory byte-compile-current-file)) (file-name-directory byte-compile-current-file))
(and buffer-file-name (and buffer-file-name
(file-name-directory buffer-file-name)))) (file-name-directory buffer-file-name))
(filename (cond ((stringp filesym) filesym) (error "Could not detect path to look for '%s' in" filesym)))
((symbolp filesym) (symbol-name filesym)) (filename (symbol-name filesym)))
(t (error "load! expected a string or symbol, got %s (a %s)"
filesym (type-of filesym))))))
(unless path
(error "Could not find %s" filename))
(let ((file (expand-file-name (concat filename ".el") path))) (let ((file (expand-file-name (concat filename ".el") path)))
(if (file-exists-p file) (if (file-exists-p file)
`(load ,(file-name-sans-extension file) ,noerror `(load ,(file-name-sans-extension file) ,noerror
,(not doom-debug-mode)) ,(not doom-debug-mode))
(unless noerror (unless noerror
(error "Could not load! file %s" file)))))) (error "Could not load file '%s' from '%s'" file path))))))
(defmacro require! (module submodule &optional flags reload-p) (defmacro require! (module submodule &optional flags reload-p)
"Loads the module specified by MODULE (a property) and SUBMODULE (a symbol). "Loads the module specified by MODULE (a property) and SUBMODULE (a symbol).