From: Chong Yidong <cyd@gnu.org>
Date: Sun, 26 Feb 2012 09:24:13 +0000 (+0800)
Subject: * help-fns.el (describe-function-1): Clarify description of remapping.
X-Git-Tag: emacs-pretest-24.0.94~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07498861aec0eb2103820342747350736419444d;p=emacs.git

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

Fixes: debbugs:10844
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 418be2539b6..9f1c4e71444 100644
--- 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 0175ffa4d9a..ed52be6cc1e 100644
--- 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)