[Emacs-diffs] /srv/bzr/emacs/trunk r107436: * help-fns.el (describe-function-1): Clarify description of remapping.

[Chong Yidong]

------------------------------------------------------------
revno: 107436
fixes bug(s): http://debbugs.gnu.org/10844
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-26 17:24:13 +0800
message:
  * help-fns.el (describe-function-1): Clarify description of remapping.
modified:
  lisp/ChangeLog
  lisp/help-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-26 09:08:19 +0000
+++ b/lisp/ChangeLog    2012-02-26 09:24:13 +0000
@@ -1,5 +1,8 @@
 2012-02-26  Chong Yidong  <address@hidden>
 
+       * 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.

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2012-02-10 07:57:21 +0000
+++ b/lisp/help-fns.el  2012-02-26 09:24:13 +0000
@@ -482,12 +482,14 @@
                  (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)