From: Jim Porter <jporterbugs@gmail.com>
Date: Fri, 4 Aug 2023 16:31:59 +0000 (-0700)
Subject: Fix loaddef generation with ";;;foo-autoload" cookies in external packages
X-Git-Tag: emacs-29.1.90~257
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8574ef314c4250f7c10245cb8abe11dcc07bfe6d;p=emacs.git

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
"<pkg>-autoloads.el" file, instead of "<pkg>-loaddefs.el" as they
should (bug#65023).

* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--parse-file):
Save match data when checking syntax.
---

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 @@ don't include."
                     ;; 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