(where-is): Report remapped commands.

diff --git a/lisp/help.el b/lisp/help.el
index 8b96b2a0b526cd2aa70a51f702413ef676575fcd..70951e021b90e3baf1478601f10ef99bf817d80b 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -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)