aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Távora2023-11-30 07:32:50 -0600
committerJoão Távora2023-11-30 08:00:06 -0600
commit7e99ed2f539a5734353aab551c690107e34ea27c (patch)
tree4efb5d98e4ef0d3daf4f420d84135e3d31d02b7c
parentff48f1401d2637a7c3c3820f5c09f411aeca4cc0 (diff)
downloademacs-bugfix/shorthand-fixes.tar.gz
emacs-bugfix/shorthand-fixes.zip
Fix prefix discovery for files with read-symbol-shorthands (bug#67325)bugfix/shorthand-fixes
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):
-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 dccdbea9240..e8093200bec 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -499,7 +499,11 @@ don't include."
499 (while (re-search-forward 499 (while (re-search-forward
500 "^(\\(def[^ \t\n]+\\)[ \t\n]+['(]*\\([^' ()\"\n]+\\)[\n \t]" nil t) 500 "^(\\(def[^ \t\n]+\\)[ \t\n]+['(]*\\([^' ()\"\n]+\\)[\n \t]" nil t)
501 (unless (member (match-string 1) autoload-ignored-definitions) 501 (unless (member (match-string 1) autoload-ignored-definitions)
502 (let ((name (match-string-no-properties 2))) 502 (let* ((name (match-string-no-properties 2))
503 ;; Consider `read-symbol-shorthands'.
504 (probe (let ((obarray (obarray-make)))
505 (car (read-from-string name)))))
506 (setq name (symbol-name probe))
503 (when (save-excursion 507 (when (save-excursion
504 (goto-char (match-beginning 0)) 508 (goto-char (match-beginning 0))
505 (or (bobp) 509 (or (bobp)