* help.el (describe-key-briefly): If KEY is a down event, read and

	discard the up event.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7c2661b2a9b39abc98ee465496603e1b50bd3f5..18fa97f0d2016890b2d2e456efab1cdfe3cc7254 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * help.el (describe-key-briefly): If KEY is a down event, read and
+       discard the up event.
+
 2006-03-07  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gud.el (gud-speedbar-buttons): Allow pointers to

diff --git a/lisp/help.el b/lisp/help.el
index 7c84f44f6a086fdf53ad52bb7f848ebc75d52fbe..a39d344dc048ff3c9f92048480121f63dbcf3e31 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -577,6 +577,12 @@ 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): "))
+          ;; If KEY is a down-event, read and discard the
+          ;; corresponding up-event.
+          (if (and (vectorp key)
+                   (eventp (elt key 0))
+                   (memq 'down (event-modifiers (elt key 0))))
+              (read-event))
           (list
            key
            (if current-prefix-arg (prefix-numeric-value current-prefix-arg))