* help.el (describe-key-briefly, describe-key): Recognize default

	bindings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3511a86f9f302ea55c4c6f7324bc32e13ac8a102..521936810a70d3768931e923956d61c340a258d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29  Chong Yidong  <cyd@stupidchicken.com>
+
+       * help.el (describe-key-briefly, describe-key): Recognize default
+       bindings.
+
 2005-11-29  Romain Francoise  <romain@orebokech.com>
 
        * view.el (view-inhibit-help-message): New defcustom.

diff --git a/lisp/help.el b/lisp/help.el
index b1e682906e33af5aedf0e730ccbfb87a2fe69b64..1e0be6f3280ee2c1c133bf02dacb701026dcabe9 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -590,7 +590,7 @@ the last key hit are used."
            (goto-char position)))
       ;; Ok, now look up the key and name the command.
       (let ((defn (or (string-key-binding key)
-                     (key-binding key)))
+                     (key-binding key t)))
            key-desc)
        ;; Don't bother user with strings from (e.g.) the select-paste menu.
        (if (stringp (aref key (1- (length key))))
@@ -635,7 +635,7 @@ the last key sequence entered are used."
       (when (windowp window)
            (set-buffer (window-buffer window))
        (goto-char position))
-      (let ((defn (or (string-key-binding key) (key-binding key))))
+      (let ((defn (or (string-key-binding key) (key-binding key t))))
        (if (or (null defn) (integerp defn) (equal defn 'undefined))
            (message "%s is undefined" (help-key-description key untranslated))
          (help-setup-xref (list #'describe-function defn) (interactive-p))