* help-fns.el (describe-function-1): Clarify description of remapping.

Fixes: debbugs:10844

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 418be2539b68c632c65b109c2d6a5bb7606fff8e..9f1c4e714440cc740c924fef9cbcc1692f4a0d0e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-26  Chong Yidong  <cyd@gnu.org>
 
+       * help-fns.el (describe-function-1): Clarify description of
+       remapping (Bug#10844).
+
        * files.el (files-equal-p): Doc fix.
        (file-subdir-of-p): Doc fix.  Convert loop macro to plain Lisp,
        and quit the loop once a mismatch is found.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 0175ffa4d9ad4990885baf54810b29f338b9e113..ed52be6cc1e5264129be11b645774be99e81c532 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -482,12 +482,14 @@ suitable file is found, return nil."
                  (if (member (event-modifiers (aref key 0)) '(nil (shift)))
                      (push key non-modified-keys)))
                (when remapped
-                 (princ "It is remapped to `")
+                 (princ "Its keys are remapped to `")
                  (princ (symbol-name remapped))
-                 (princ "'"))
+                 (princ "'.\n"))
 
                (when keys
-                 (princ (if remapped ", which is bound to " "It is bound to "))
+                 (princ (if remapped
+                            "Without this remapping, it would be bound to "
+                          "It is bound to "))
                  ;; If lots of ordinary text characters run this command,
                  ;; don't mention them one by one.
                  (if (< (length non-modified-keys) 10)