procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make where-is correctly identify aliases

Browse source 
* lisp/help.el (where-is): Make aliases correctly say which
function is an alias for what (bug#37325).
This commit is contained in:
Sebastian Urban 2022-01-28 17:27:28 +01:00 • committed by Lars Ingebrigtsen
parent 96867f9d08
commit 1f5fa1de7f
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/help.el
View file

@ -650,15 +650,21 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
(if insert
(if (> (length keys) 0)
(if remapped
(format "%s (%s) (remapped from %s)"
keys remapped symbol)
(format "%s (%s)" keys symbol))
(format "%s, remapped to %s (%s)"
symbol remapped keys)
(format "%s (%s)" symbol keys))
(format "M-x %s RET" symbol))
(if (> (length keys) 0)
(if remapped
(format "%s is remapped to %s which is on %s"
symbol remapped keys)
(format "%s is on %s" symbol keys))
(if (eq symbol (symbol-function definition))
(format
"%s, which is remapped to %s, which is on %s"
symbol remapped keys)
(format "%s is remapped to %s, which is on %s"
symbol remapped keys))
(if (eq symbol (symbol-function definition))
(format "%s, which is on %s" symbol keys)
(format "%s is on %s" symbol keys)))
;; If this is the command the user asked about,
;; and it is not on any key, say so.
;; For other symbols, its aliases, say nothing
@ -667,7 +673,9 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
(format "%s is not on any key" symbol)))))
(when string
(unless (eq symbol definition)
(princ ";\n its alias "))
(if (eq definition (symbol-function symbol))
(princ ";\n its alias ")
(princ ";\n it's an alias for ")))
(princ string)))))
nil)