From 86581698acc1a0991592e018c1ba749f3ded21be Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 18 Oct 2022 13:14:08 +0200 Subject: Fix faulty loaddefs detection * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--emacs-batch): Fix faulty loaddefs detection. --- lisp/emacs-lisp/loaddefs-gen.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/loaddefs-gen.el') diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el index a1c4f91579e..a76bcf604f7 100644 --- a/lisp/emacs-lisp/loaddefs-gen.el +++ b/lisp/emacs-lisp/loaddefs-gen.el @@ -738,7 +738,8 @@ rules for built-in packages and excluded files." (expand-file-name "emacs-lisp/loaddefs-gen.el" lisp-directory) output-file))) (let ((lisp-mode-autoload-regexp - "^;;;###\\(\\(noexist\\)-\\)?\\(theme-autoload\\)")) + ;; Avoid autoloads detection from loaddefs-gen. + (concat "^;;;###\\(\\(noexist\\)-\\)?\\(theme" "-autoload\\)"))) (loaddefs-generate (expand-file-name "../etc/themes/" lisp-directory) (expand-file-name "theme-loaddefs.el" lisp-directory)))) -- cgit v1.2.3 From 6cabef8799eb053c593f0a5241503ccbfb616c8a Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 18 Oct 2022 13:17:52 +0200 Subject: Fix previous loaddefs-gen fix --- lisp/emacs-lisp/loaddefs-gen.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lisp/emacs-lisp/loaddefs-gen.el') diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el index a76bcf604f7..ecc5f7e47bd 100644 --- a/lisp/emacs-lisp/loaddefs-gen.el +++ b/lisp/emacs-lisp/loaddefs-gen.el @@ -738,13 +738,12 @@ rules for built-in packages and excluded files." (expand-file-name "emacs-lisp/loaddefs-gen.el" lisp-directory) output-file))) (let ((lisp-mode-autoload-regexp - ;; Avoid autoloads detection from loaddefs-gen. - (concat "^;;;###\\(\\(noexist\\)-\\)?\\(theme" "-autoload\\)"))) + "^;;;###\\(\\(noexist\\)-\\)?\\(theme-autoload\\)")) (loaddefs-generate (expand-file-name "../etc/themes/" lisp-directory) (expand-file-name "theme-loaddefs.el" lisp-directory)))) -;;;###autoload (load "theme-loaddefs.el") +;;;###autoload (load "theme-loaddefs.el" t) (provide 'loaddefs-gen) -- cgit v1.2.3