(describe-function-1): Report remapped commands.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index a158ddf64fe7c25fdbd96f8792685000c2ce4def..20d76f9c9132029525f862beee5e04792eb850e1 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -207,12 +207,20 @@ and the file name is displayed in the echo area."
     (princ ".")
     (terpri)
     (when (commandp function)
-      (let ((keys (where-is-internal
-                  function overriding-local-map nil nil)))
+      (let* ((binding (and (symbolp function) (commandp function)
+                          (key-binding function nil t)))
+            (remapped (and (symbolp binding) (commandp binding) binding))
+            (keys (where-is-internal
+                  (or remapped function) overriding-local-map nil nil)))
+       (when remapped
+         (princ "It is remapped to `")
+         (princ (symbol-name remapped))
+         (princ "'"))
        (when keys
-         (princ "It is bound to ")
+         (princ (if remapped " which is bound to " "It is bound to "))
          ;; FIXME: This list can be very long (f.ex. for self-insert-command).
-         (princ (mapconcat 'key-description keys ", "))
+         (princ (mapconcat 'key-description keys ", ")))
+       (when (or remapped keys)
          (princ ".")
          (terpri))))
     ;; Handle symbols aliased to other symbols.