From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 4 Aug 2022 20:58:59 +0000 (+0200)
Subject: Be more lax when picking up prefixes for loaddefs
X-Git-Tag: emacs-29.0.90~1447^2~429
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d73a104dd349fdf8de5ababa9ae53ea807b00bfb;p=emacs.git

Be more lax when picking up prefixes for loaddefs

* lisp/emacs-lisp/loaddefs-gen.el
(loaddefs-generate--compute-prefixes): Allow tabs and spaces before
symbol name, so that "(defvar\tfoo-bar nil)" is properly picked up.
Before this change, such a definition would be wrongly picked up as
the symbol "nil".
---

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 52ec5ef6809..afba9f8fbc7 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -456,7 +456,7 @@ don't include."
   (let ((prefs nil))
     ;; Avoid (defvar <foo>) by requiring a trailing space.
     (while (re-search-forward
-            "^(\\(def[^ ]+\\) ['(]*\\([^' ()\"\n]+\\)[\n \t]" nil t)
+            "^(\\(def[^ \t]+\\)[ \t]+['(]*\\([^' ()\"\n]+\\)[\n \t]" nil t)
       (unless (member (match-string 1) autoload-ignored-definitions)
         (let ((name (match-string-no-properties 2)))
           (when (save-excursion