From 5252362cd13c381fea07129f99808c50cd03e1ab Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Fri, 4 Aug 2023 09:31:59 -0700 Subject: [PATCH] Fix loaddef generation with ";;;foo-autoload" cookies in external packages This caused an issue where package-specific autoload cookies weren't being correctly recognized, so they got dumped into the package's main "-autoloads.el" file, instead of "-loaddefs.el" as they should (bug#65023). * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--parse-file): Save match data when checking syntax. --- lisp/emacs-lisp/loaddefs-gen.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el index 5db9af21508..d7b9b131bc8 100644 --- a/lisp/emacs-lisp/loaddefs-gen.el +++ b/lisp/emacs-lisp/loaddefs-gen.el @@ -431,7 +431,8 @@ loaddefs-generate--parse-file ;; have an autoload cookie on the first column of a ;; doc string or the like. (The Emacs tree ;; shouldn't contain any such instances.) - (not (ppss-string-terminator (syntax-ppss)))) + (not (ppss-string-terminator + (save-match-data (syntax-ppss))))) ;; ... and if we have one of these names, then alter outfile. (let* ((aname (match-string 2)) (to-file (if aname -- 2.25.1