aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2005-11-29 15:42:42 +0000
committerChong Yidong2005-11-29 15:42:42 +0000
commit2c30b4506a647d128e83bcb7f932e05661097b47 (patch)
tree6537debc69919c8f81a3d88965524d297f1e2509 /lisp
parent1c0484e2a2cdd089d16eeadfd057f08ccbb2308d (diff)
downloademacs-2c30b4506a647d128e83bcb7f932e05661097b47.tar.gz
emacs-2c30b4506a647d128e83bcb7f932e05661097b47.zip
* help.el (describe-key-briefly, describe-key): Recognize default
bindings.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3511a86f9f3..521936810a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-11-29 Chong Yidong <cyd@stupidchicken.com>
2
3 * help.el (describe-key-briefly, describe-key): Recognize default
4 bindings.
5
12005-11-29 Romain Francoise <romain@orebokech.com> 62005-11-29 Romain Francoise <romain@orebokech.com>
2 7
3 * view.el (view-inhibit-help-message): New defcustom. 8 * view.el (view-inhibit-help-message): New defcustom.
diff --git a/lisp/help.el b/lisp/help.el
index b1e682906e3..1e0be6f3280 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -590,7 +590,7 @@ the last key hit are used."
590 (goto-char position))) 590 (goto-char position)))
591 ;; Ok, now look up the key and name the command. 591 ;; Ok, now look up the key and name the command.
592 (let ((defn (or (string-key-binding key) 592 (let ((defn (or (string-key-binding key)
593 (key-binding key))) 593 (key-binding key t)))
594 key-desc) 594 key-desc)
595 ;; Don't bother user with strings from (e.g.) the select-paste menu. 595 ;; Don't bother user with strings from (e.g.) the select-paste menu.
596 (if (stringp (aref key (1- (length key)))) 596 (if (stringp (aref key (1- (length key))))
@@ -635,7 +635,7 @@ the last key sequence entered are used."
635 (when (windowp window) 635 (when (windowp window)
636 (set-buffer (window-buffer window)) 636 (set-buffer (window-buffer window))
637 (goto-char position)) 637 (goto-char position))
638 (let ((defn (or (string-key-binding key) (key-binding key)))) 638 (let ((defn (or (string-key-binding key) (key-binding key t))))
639 (if (or (null defn) (integerp defn) (equal defn 'undefined)) 639 (if (or (null defn) (integerp defn) (equal defn 'undefined))
640 (message "%s is undefined" (help-key-description key untranslated)) 640 (message "%s is undefined" (help-key-description key untranslated))
641 (help-setup-xref (list #'describe-function defn) (interactive-p)) 641 (help-setup-xref (list #'describe-function defn) (interactive-p))