summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorJoão Távora <joaotavora@gmail.com>2023-11-30 07:32:50 -0600
committerJoão Távora <joaotavora@gmail.com>2024-02-03 08:40:03 -0600
commit817140a852e79c5ef3cf7dc5e4c50aa710e8c4a2 (patch)
treee5a4a303cf32305e24f0dfd21a3dddf01b86d85c /lisp/emacs-lisp
parentc52d17d91ade6c789d8672dbd1301ba86ba4d7d1 (diff)
downloademacs-817140a852e79c5ef3cf7dc5e4c50aa710e8c4a2.tar.gz
emacs-817140a852e79c5ef3cf7dc5e4c50aa710e8c4a2.tar.bz2
emacs-817140a852e79c5ef3cf7dc5e4c50aa710e8c4a2.zip
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):
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/loaddefs-gen.el6
1 files changed, 5 insertions, 1 deletions
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)