emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 817140a852e 6/8: Fix prefix discovery for files with read-symbol-


From: João Távora
Subject: master 817140a852e 6/8: Fix prefix discovery for files with read-symbol-shorthands (bug#67325)
Date: Sat, 3 Feb 2024 09:44:08 -0500 (EST)

branch: master
commit 817140a852e79c5ef3cf7dc5e4c50aa710e8c4a2
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Fix prefix discovery for files with read-symbol-shorthands (bug#67325)
    
    In a previous commit, the local-variable read-symbol-shorthands is
    already read into the temporary buffer used for the autoload parsing
    aerobatics, so all we needed to do in 'l-g--compute-prefixes' is
    use 'read' to give 'read-symbol-shorthands' a chance to kick in.
    
    * lisp/emacs-lisp/loaddefs-gen.el
    (loaddefs-generate--compute-prefixes):
---
 lisp/emacs-lisp/loaddefs-gen.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index bf5cd24f161..8aacbf406b6 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -499,7 +499,11 @@ don't include."
     (while (re-search-forward
             "^(\\(def[^ \t\n]+\\)[ \t\n]+['(]*\\([^' ()\"\n]+\\)[\n \t]" nil t)
       (unless (member (match-string 1) autoload-ignored-definitions)
-        (let ((name (match-string-no-properties 2)))
+        (let* ((name (match-string-no-properties 2))
+               ;; Consider `read-symbol-shorthands'.
+               (probe (let ((obarray (obarray-make)))
+                        (car (read-from-string name)))))
+          (setq name (symbol-name probe))
           (when (save-excursion
                   (goto-char (match-beginning 0))
                   (or (bobp)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]