diff options
| author | Chong Yidong | 2006-03-07 15:53:41 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-03-07 15:53:41 +0000 |
| commit | 46d91fa0dff86fe6212466b40c68a2a08a1523d2 (patch) | |
| tree | 07a31ae79f23668cfc725dcc2fbf2a60eb662f32 | |
| parent | 19bf3d3fa4b714b62170276250441bd726a3f625 (diff) | |
| download | emacs-46d91fa0dff86fe6212466b40c68a2a08a1523d2.tar.gz emacs-46d91fa0dff86fe6212466b40c68a2a08a1523d2.zip | |
* help.el (describe-key-briefly): If KEY is a down event, read and
discard the up event.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help.el | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7c2661b2a9..18fa97f0d20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-03-07 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * help.el (describe-key-briefly): If KEY is a down event, read and | ||
| 4 | discard the up event. | ||
| 5 | |||
| 1 | 2006-03-07 Nick Roberts <nickrob@snap.net.nz> | 6 | 2006-03-07 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 7 | ||
| 3 | * progmodes/gud.el (gud-speedbar-buttons): Allow pointers to | 8 | * progmodes/gud.el (gud-speedbar-buttons): Allow pointers to |
diff --git a/lisp/help.el b/lisp/help.el index 7c84f44f6a0..a39d344dc04 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -577,6 +577,12 @@ temporarily enables it to allow getting help on disabled items and buttons." | |||
| 577 | (setq saved-yank-menu (copy-sequence yank-menu)) | 577 | (setq saved-yank-menu (copy-sequence yank-menu)) |
| 578 | (menu-bar-update-yank-menu "(any string)" nil)) | 578 | (menu-bar-update-yank-menu "(any string)" nil)) |
| 579 | (setq key (read-key-sequence "Describe key (or click or menu item): ")) | 579 | (setq key (read-key-sequence "Describe key (or click or menu item): ")) |
| 580 | ;; If KEY is a down-event, read and discard the | ||
| 581 | ;; corresponding up-event. | ||
| 582 | (if (and (vectorp key) | ||
| 583 | (eventp (elt key 0)) | ||
| 584 | (memq 'down (event-modifiers (elt key 0)))) | ||
| 585 | (read-event)) | ||
| 580 | (list | 586 | (list |
| 581 | key | 587 | key |
| 582 | (if current-prefix-arg (prefix-numeric-value current-prefix-arg)) | 588 | (if current-prefix-arg (prefix-numeric-value current-prefix-arg)) |