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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f8a6135fdc793d92ffd6a6282327b41764c4d80..219fd382e50ce28d26db4bfe58b1eac0c49a795f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-07  Chong Yidong  <cyd@gnu.org>
+
+       * help.el (describe-key-briefly): Allow the message to be seen
+       when invoked from the minibuffer (Bug#7014).
+
 2012-09-07  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-end-of-defun)

diff --git a/lisp/help.el b/lisp/help.el
index cacbf185963ff4c7650150c722433381be322bde..da11389d87cf42cbcb2998de48f5a44e828e19d2 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -585,6 +585,8 @@ temporarily enables it to allow getting help on disabled items and buttons."
             (setq saved-yank-menu (copy-sequence yank-menu))
             (menu-bar-update-yank-menu "(any string)" nil))
           (setq key (read-key-sequence "Describe key (or click or menu item): "))
+          ;; Clear the echo area message (Bug#7014).
+          (message nil)
           ;; If KEY is a down-event, read and discard the
           ;; corresponding up-event.  Note that there are also
           ;; down-events on scroll bars and mode lines: the actual