aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-09-07 13:00:32 +0800
committerChong Yidong2012-09-07 13:00:32 +0800
commit74c582e64c6b14545fd4188a604e313cbe56a89f (patch)
tree36bb51d468a4b0f263c6dad4b1d601a78099f779
parent52404181acc9d4c31eb0d1cf35db7d10e3a4afde (diff)
downloademacs-74c582e64c6b14545fd4188a604e313cbe56a89f.tar.gz
emacs-74c582e64c6b14545fd4188a604e313cbe56a89f.zip
Fix for invoking C-h c from the minibuffer.
* help.el (describe-key-briefly): Allow the message to be seen when invoked from the minibuffer. Fixes: debbugs:7014
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f8a6135fdc..219fd382e50 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-09-07 Chong Yidong <cyd@gnu.org>
2
3 * help.el (describe-key-briefly): Allow the message to be seen
4 when invoked from the minibuffer (Bug#7014).
5
12012-09-07 Dmitry Gutov <dgutov@yandex.ru> 62012-09-07 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * progmodes/ruby-mode.el (ruby-end-of-defun) 8 * progmodes/ruby-mode.el (ruby-end-of-defun)
diff --git a/lisp/help.el b/lisp/help.el
index cacbf185963..da11389d87c 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -585,6 +585,8 @@ temporarily enables it to allow getting help on disabled items and buttons."
585 (setq saved-yank-menu (copy-sequence yank-menu)) 585 (setq saved-yank-menu (copy-sequence yank-menu))
586 (menu-bar-update-yank-menu "(any string)" nil)) 586 (menu-bar-update-yank-menu "(any string)" nil))
587 (setq key (read-key-sequence "Describe key (or click or menu item): ")) 587 (setq key (read-key-sequence "Describe key (or click or menu item): "))
588 ;; Clear the echo area message (Bug#7014).
589 (message nil)
588 ;; If KEY is a down-event, read and discard the 590 ;; If KEY is a down-event, read and discard the
589 ;; corresponding up-event. Note that there are also 591 ;; corresponding up-event. Note that there are also
590 ;; down-events on scroll bars and mode lines: the actual 592 ;; down-events on scroll bars and mode lines: the actual