From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 14 Feb 2006 08:14:01 +0000 (+0000)
Subject: (where-is): Fix displaying of remappings.
X-Git-Tag: emacs-pretest-22.0.90~4153
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5f435502d4cf4f06ad2299e0be6e54d86bbe34c;p=emacs.git

(where-is): Fix displaying of remappings.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83e47bfc26d..207d7c50607 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* help.el (where-is): Fix message for remapped commands.
+
 2006-02-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (safe-local-variable-values): New option.
@@ -17,13 +21,13 @@
 	moved to safe-local-variable-p.
 	(hack-one-local-variable): Checks moved to hack-local-variables.
 
-	(byte-compile-dynamic, c-basic-offset, c-file-style,
-	c-indent-level, comment-column, fill-column, fill-prefix,
-	indent-tabs-mode, kept-new-versions, no-byte-compile,
-	no-update-autoloads, outline-regexp, page-delimiter,
-	paragraph-start, paragraph-separate, sentence-end,
-	sentence-end-double-space tab-width, version-control): Add
-	`safe-local-variable' property.
+	(byte-compile-dynamic, c-basic-offset, c-file-style)
+	(c-indent-level, comment-column, fill-column, fill-prefix)
+	(indent-tabs-mode, kept-new-versions, no-byte-compile)
+	(no-update-autoloads, outline-regexp, page-delimiter)
+	(paragraph-start, paragraph-separate, sentence-end)
+	(sentence-end-double-space tab-width, version-control):
+	Add `safe-local-variable' property.
 
 	* find-lisp.el: Delete nonexistent `autocompile' file variable.
 
@@ -49,7 +53,7 @@
 
 2006-02-13  Jay Belanger  <belanger@truman.edu>
 
-	* calc/calc-arith.el:  (math-check-known-matrixp): Make sure
+	* calc/calc-arith.el (math-check-known-matrixp): Make sure
 	expression is a symbol before checking that it is bound.
 
 2006-02-13  Richard M. Stallman  <rms@gnu.org>
@@ -61,7 +65,7 @@
 	inside `interactive' spec.
 	(describe-key-briefly-internal, describe-key-internal):
 	Functions merged back into their callers.
-	
+
 2006-02-13  Martin Rudalics  <rudalics@gmx.at>  (tiny change)
 
 	* info.el (info-xref-visited): Inherit from info-xref too.
diff --git a/lisp/help.el b/lisp/help.el
index 76aeac0ef62..02045948ecb 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -510,7 +510,7 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
 		(if (> (length keys) 0)
 		    (if remapped
 			(format "%s is remapped to %s which is on %s"
-				definition symbol keys)
+				symbol remapped keys)
 		      (format "%s is on %s" symbol keys))
 		  ;; If this is the command the user asked about,
 		  ;; and it is not on any key, say so.