Commit 290bfb66 authored by Kim F. Storm's avatar Kim F. Storm

(where-is): Report remapped commands.

parent 4857ef58
......@@ -412,15 +412,22 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
(list (if (equal val "")
fn (intern val))
current-prefix-arg)))
(let* ((keys (where-is-internal definition overriding-local-map nil nil))
(let* ((binding (and (symbolp definition) (commandp definition)
(key-binding definition nil t)))
(remap (and (symbolp binding) (commandp binding) binding))
(keys (where-is-internal definition overriding-local-map nil nil remap))
(keys1 (mapconcat 'key-description keys ", "))
(standard-output (if insert (current-buffer) t)))
(if insert
(if (> (length keys1) 0)
(princ (format "%s (%s)" keys1 definition))
(if remap
(princ (format "%s (%s) (remapped from %s)" keys1 remap definition))
(princ (format "%s (%s)" keys1 definition)))
(princ (format "M-x %s RET" definition)))
(if (> (length keys1) 0)
(princ (format "%s is on %s" definition keys1))
(if remap
(princ (format "%s is remapped to %s which is on %s" definition remap keys1))
(princ (format "%s is on %s" definition keys1)))
(princ (format "%s is not on any key" definition)))))
nil)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment