mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Await the final mouse event in C-h c and C-h k.

Browse source 
* lisp/help.el (describe-key-briefly, describe-key): On receiving a mouse
event, keep reading further events until a timeout occurs, to ensure we have
the complete mouse event from the user.
This commit is contained in:
Alan Mackenzie 2016-02-19 17:10:57 +00:00
parent 5e8a62917a
commit 10c0e1ca40
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/help.el
View file

@ -613,7 +613,15 @@ temporarily enables it to allow getting help on disabled items and buttons."
(when (null (cdr yank-menu))
(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): "))
(while
(progn
(setq key (read-key-sequence "Describe key (or click or menu item): "))
(and (vectorp key)
(consp (aref key 0))
(symbolp (car (aref key 0)))
(string-match "\\(mouse\\|down\\|click\\|drag\\)"
(symbol-name (car (aref key 0))))
(not (sit-for (/ double-click-time 1000.0) t)))))
;; Clear the echo area message (Bug#7014).
(message nil)
;; If KEY is a down-event, read and discard the
@ -750,7 +758,15 @@ temporarily enables it to allow getting help on disabled items and buttons."
(when (null (cdr yank-menu))
(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): "))
(while
(progn
(setq key (read-key-sequence "Describe key (or click or menu item): "))
(and (vectorp key)
(consp (aref key 0))
(symbolp (car (aref key 0)))
(string-match "\\(mouse\\|down\\|click\\|drag\\)"
(symbol-name (car (aref key 0))))
(not (sit-for (/ double-click-time 1000.0) t)))))
(list
key
(prefix-numeric-value current-prefix-arg)