[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)
- master updated (25bf8d3cdc6 -> f266622cdb3), João Távora, 2024/02/03
- master c2aaa8f15aa 2/8: Process read-symbol-shorthands from longest to shortest (bug#67390), João Távora, 2024/02/03
- master 17c3610c561 3/8: Consider read-symbol-shorthands in check-declare.el (bug#67523), João Távora, 2024/02/03
- master 817140a852e 6/8: Fix prefix discovery for files with read-symbol-shorthands (bug#67325),
João Távora <=
- master 9a51fbb69fc 7/8: ; Also consider shorthands in check-declare-scan (bug#67523), João Távora, 2024/02/03
- master 5e4a0a29fa3 1/8: Make sure read-symbol-shorthands is permanently local, João Távora, 2024/02/03
- master 0f715f9c154 4/8: Improve shorthands-font-lock-shorthands (bug#67390), João Távora, 2024/02/03
- master c52d17d91ad 5/8: Also teach loaddefs-gen.el about shorthands (bug#63480), João Távora, 2024/02/03
- master f266622cdb3 8/8: ; Optimize shorthand insertion in loaddefs-generate--parse-file, João Távora, 2024/02/03