[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 96d52f89444 6/7: Fix function help for advised aliases (bug#647
From: |
Eli Zaretskii |
Subject: |
emacs-29 96d52f89444 6/7: Fix function help for advised aliases (bug#64797) |
Date: |
Sun, 30 Jul 2023 03:29:36 -0400 (EDT) |
branch: emacs-29
commit 96d52f894441c06d7fdc10617e707f410ad66cc3
Author: Mattias EngdegÄrd <mattiase@acm.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Fix function help for advised aliases (bug#64797)
* lisp/help-fns.el (help-fns--analyze-function):
For aliases, use the base function name if at the end of the chain.
This fixes a regression introduced in d30fde6b0cc.
Reported by Michael Heerdegen.
(cherry picked from commit 024bd1f09099ae186442001a75e578638070e296)
---
lisp/help-fns.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index be13d40cfa3..eb50f3b26ca 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -995,7 +995,8 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED
REAL-DEF)."
(symbol-name function)))))))
(real-def (cond
((and aliased (not (subrp def)))
- (car (function-alias-p real-function t)))
+ (or (car (function-alias-p real-function))
+ real-function))
((subrp def) (intern (subr-name def)))
(t def))))
- emacs-29 updated (4a687bcc20d -> 0002d4f3166), Eli Zaretskii, 2023/07/30
- emacs-29 96d52f89444 6/7: Fix function help for advised aliases (bug#64797),
Eli Zaretskii <=
- emacs-29 b2cb6e82160 4/7: ; Better documentation of HOME on MS-Windows, Eli Zaretskii, 2023/07/30
- emacs-29 54e98b5f9bd 3/7: ; Clarify documentation of 'server-after-make-frame-hook', Eli Zaretskii, 2023/07/30
- emacs-29 d13029cdcde 2/7: Avoid crashes under 'which-key-mode', Eli Zaretskii, 2023/07/30
- emacs-29 cb1f7db2490 1/7: ; Minor documentation fixes, Eli Zaretskii, 2023/07/30
- emacs-29 0002d4f3166 7/7: Avoid spurious whitespace in the modeline of emacsclient frames, Eli Zaretskii, 2023/07/30
- emacs-29 71419a60c37 5/7: Avoid crashes due to invalid 'mode-line-format', Eli Zaretskii, 2023/07/30