mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Fix generation of defvars defined by easy-mmode and company in loaddefs.el

Browse source 
* lisp/emacs-lisp/loaddefs-gen.el
(loaddefs-generate--make-autoload): Restore previously existing
conditions for recursing on macroexpansions when processing
easy-mmode and related macros.
This commit is contained in:
Po Lu 2025-08-14 19:33:09 +08:00
parent 02f5a075dc
commit e9800cabff
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/emacs-lisp/loaddefs-gen.el
View file

@ -244,7 +244,25 @@ expand)' among their `declare' forms."
(setq expand (let ((load-true-file-name file)
(load-file-name file))
(macroexpand form)))
(not (eq car (car expand)))))
(or (and
;; Previously, macros defined in this list would not
;; see their expansions processed in place of
;; themselves if such an expansion did not yield a
;; `progn', `prog1' or `defalias' form. Not
;; reproducing these conditions results in the
;; omission of minor mode variables and suchlike in
;; loaddefs.el when only the defuns in the
;; macroexpansions are autoloaded.
(not (memq car '( define-globalized-minor-mode defun defmacro
define-minor-mode define-inline
cl-defun cl-defmacro cl-defgeneric
cl-defstruct pcase-defmacro iter-defun cl-iter-defun
;; Obsolete; keep until the alias is removed.
easy-mmode-define-global-mode
easy-mmode-define-minor-mode
define-global-minor-mode)))
(not (eq car (car expand))))
(memq (car expand) '(progn prog1 defalias)))))
;; Recurse on the expansion.
(loaddefs-generate--make-autoload expand file 'expansion))