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

Refactor def-package!

Browse source 
Rely on use-package mechanisms. def-package! should be as thin a wrapper
as possible. Ideally, we should simply be an alias, but there is no way
to inject :disabled into a use-package declaration, because it is
treated especially.
This commit is contained in:
Henrik Lissner 2018-06-16 00:36:27 +02:00
parent 2047a52fcd
commit a1278f3dff
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
core/core-modules.el
View file

@ -172,24 +172,33 @@ non-nil, return paths of possible modules, activated or otherwise."
(autoload 'use-package "use-package-core" nil nil t) (autoload 'use-package "use-package-core" nil nil t)
(defvar doom--deferred-packages-alist ())
(after! use-package-core
;; Prevent packages from being loaded at compile time if they don't meet their
;; own predicates.
(push (list :no-require t
(lambda (name args)
(and (bound-and-true-p byte-compile-current-file)
(or (when-let* ((pred (or (plist-get args :if)
(plist-get args :when))))
(not (eval pred t)))
(when-let* ((pred (plist-get args :unless)))
(eval pred t))))))
use-package-defaults)
;; Adds the :after-call custom keyword to `use-package' (and consequently, ;; Adds the :after-call custom keyword to `use-package' (and consequently,
;; `def-package!'). :after-call takes a symbol or list of symbols. These symbols ;; `def-package!'). :after-call takes a symbol or list of symbols. These
;; can be functions or hook variables. ;; symbols can be functions or hook variables.
;; ;;
;; (use-package X :after-call find-file-hook) ;; (use-package X :after-call find-file-hook)
;; ;;
;; This will load X on the first invokation of `find-file-hook' (then it will ;; This will load X on the first invokation of `find-file-hook' (then it will
;; remove itself from the hook/function). ;; remove itself from the hook/function).
(defvar doom--deferred-packages-alist ())
(after! use-package-core
(add-to-list 'use-package-deferring-keywords :after-call nil #'eq) (add-to-list 'use-package-deferring-keywords :after-call nil #'eq)
(setq use-package-keywords (setq use-package-keywords
(use-package-list-insert :after-call use-package-keywords :after)) (use-package-list-insert :after-call use-package-keywords :after))
(defalias 'use-package-normalize/:after-call (defalias 'use-package-normalize/:after-call 'use-package-normalize-symlist)
'use-package-normalize-symlist)
(defun use-package-handler/:after-call (name _keyword hooks rest state) (defun use-package-handler/:after-call (name _keyword hooks rest state)
(let ((fn (intern (format "doom|transient-hook--load-%s" name))) (let ((fn (intern (format "doom|transient-hook--load-%s" name)))
(hooks (delete-dups hooks))) (hooks (delete-dups hooks)))
@ -288,18 +297,12 @@ to least)."
(load ,(expand-file-name "config" doom-private-dir) (load ,(expand-file-name "config" doom-private-dir)
t (not doom-debug-mode)))))))) t (not doom-debug-mode))))))))
(defvar doom-disabled-packages)
(defmacro def-package! (name &rest plist) (defmacro def-package! (name &rest plist)
"A thin wrapper around `use-package'." "This is a thin wrapper around `use-package'."
;; Ignore package if NAME is in `doom-disabled-packages' `(use-package ,name
(when (memq name (bound-and-true-p doom-disabled-packages)) ,@(append (if (memq name doom-disabled-packages) `(:disabled t))
(setq plist `(:disabled t ,@plist))) plist)))
;; If byte-compiling, ignore this package if it doesn't meet the condition.
;; This avoids false-positive load errors.
(unless (and (bound-and-true-p byte-compile-current-file)
(or (and (plist-member plist :if) (not (eval (plist-get plist :if) t)))
(and (plist-member plist :when) (not (eval (plist-get plist :when) t)))
(and (plist-member plist :unless) (eval (plist-get plist :unless) t))))
`(use-package ,name ,@plist)))
(defmacro def-package-hook! (package when &rest body) (defmacro def-package-hook! (package when &rest body)
"Reconfigures a package's `def-package!' block. "Reconfigures a package's `def-package!' block.