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

docs(lib): update after! to reflect changes upstream

Browse source 
It used to be that after! suppressed macro expansion, but at some point
around 28.1, the elisp interpreter started recognizing the
compiler-macro hint in eval-after-load's definition; implicitly wrapping
quoted forms in a function. Therefore, we can no longer rely on
eval-after-load to hide macros from the byte-compiler. Instead, modules
will need to take care to wrap macro calls in `eval` or similar, on a
case-by-case basis.
This commit is contained in:
Henrik Lissner 2022-08-18 16:15:29 +02:00
parent a7e147088c
commit 8b4f722fa3
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lisp/doom-lib.el
View file

@ -496,27 +496,30 @@ The current file is the file from which `add-to-load-path!' is used."
(defmacro after! (package &rest body) (defmacro after! (package &rest body)
"Evaluate BODY after PACKAGE have loaded. "Evaluate BODY after PACKAGE have loaded.
PACKAGE is a symbol or list of them. These are package names, not modes, PACKAGE is a symbol (or list of them) referring to Emacs features (aka
functions or variables. It can be: packages). PACKAGE may use :or/:any and :and/:all operators. The precise format
is:
- An unquoted package symbol (the name of a package) - An unquoted package symbol (the name of a package)
(after! helm BODY...) (after! helm BODY...)
- An unquoted list of package symbols (i.e. BODY is evaluated once both magit
and git-gutter have loaded)
(after! (magit git-gutter) BODY...)
- An unquoted, nested list of compound package lists, using any combination of - An unquoted, nested list of compound package lists, using any combination of
:or/:any and :and/:all :or/:any and :and/:all
(after! (:or package-a package-b ...) BODY...) (after! (:or package-a package-b ...) BODY...)
(after! (:and package-a package-b ...) BODY...) (after! (:and package-a package-b ...) BODY...)
(after! (:and package-a (:or package-b package-c) ...) BODY...) (after! (:and package-a (:or package-b package-c) ...) BODY...)
Without :or/:any/:and/:all, :and/:all are implied. - An unquoted list of package symbols (i.e. BODY is evaluated once both magit
and git-gutter have loaded)
(after! (magit git-gutter) BODY...)
If :or/:any/:and/:all are omitted, :and/:all are implied.
This is a wrapper around `eval-after-load' that: This emulates `eval-after-load' with a few key differences:
1. Suppresses warnings for disabled packages at compile-time 1. No-ops for package that are disabled by the user (via `package!') or not
2. No-ops for package that are disabled by the user (via `package!') installed yet.
3. Supports compound package statements (see below) 2. Supports compound package statements (see :or/:any and :and/:all above).
4. Prevents eager expansion pulling in autoloaded macros all at once"
Since the contents of these blocks will never by byte-compiled, avoid putting
things you want byte-compiled in them! Like function/macro definitions."
(declare (indent defun) (debug t)) (declare (indent defun) (debug t))
(if (symbolp package) (if (symbolp package)
(unless (memq package (bound-and-true-p doom-disabled-packages)) (unless (memq package (bound-and-true-p doom-disabled-packages))
@ -524,9 +527,6 @@ This is a wrapper around `eval-after-load' that:
(require package nil 'noerror)) (require package nil 'noerror))
#'progn #'progn
#'with-no-warnings) #'with-no-warnings)
;; We intentionally avoid `with-eval-after-load' to prevent eager
;; macro expansion from pulling (or failing to pull) in autoloaded
;; macros/packages.
`(eval-after-load ',package ',(macroexp-progn body)))) `(eval-after-load ',package ',(macroexp-progn body))))
(let ((p (car package))) (let ((p (car package)))
(cond ((memq p '(:or :any)) (cond ((memq p '(:or :any))