Mercurial > emacs
changeset 67204:0ae69a6a591d
* help.el (describe-key-briefly, describe-key): Recognize default
bindings.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Tue, 29 Nov 2005 15:42:42 +0000 |
parents | 78e1225a40a2 |
children | 06635bf17a9e |
files | lisp/ChangeLog lisp/help.el |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Nov 29 10:53:30 2005 +0000 +++ b/lisp/ChangeLog Tue Nov 29 15:42:42 2005 +0000 @@ -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.
--- a/lisp/help.el Tue Nov 29 10:53:30 2005 +0000 +++ b/lisp/help.el Tue Nov 29 15:42:42 2005 +0000 @@ -590,7 +590,7 @@ (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 @@ (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))