Commit 98da283b authored by Chong Yidong's avatar Chong Yidong
Browse files

* help.el (describe-key-briefly, describe-key): Don't expect an

	extra up event if a down-event is generated by a popup menu.
parent abb67ad3
2006-09-23 Chong Yidong <cyd@stupidchicken.com>
* help.el (describe-key-briefly, describe-key): Don't expect an
extra up event if a down-event is generated by a popup menu.
2006-09-23 Michal Nazarewicz <mnazarewicz@gmail.com> (tiny change) 2006-09-23 Michal Nazarewicz <mnazarewicz@gmail.com> (tiny change)
   
* textmodes/ispell.el (ispell-change-dictionary): Don't check the * textmodes/ispell.el (ispell-change-dictionary): Don't check the
......
...@@ -572,7 +572,12 @@ temporarily enables it to allow getting help on disabled items and buttons." ...@@ -572,7 +572,12 @@ temporarily enables it to allow getting help on disabled items and buttons."
;; event then is in the second element of the vector. ;; event then is in the second element of the vector.
(and (vectorp key) (and (vectorp key)
(or (and (eventp (aref key 0)) (or (and (eventp (aref key 0))
(memq 'down (event-modifiers (aref key 0)))) (memq 'down (event-modifiers (aref key 0)))
;; However, for the C-down-mouse-2 popup
;; menu, there is no subsequent up-event. In
;; this case, the up-event is the next
;; element in the supplied vector.
(= (length key) 1))
(and (> (length key) 1) (and (> (length key) 1)
(eventp (aref key 1)) (eventp (aref key 1))
(memq 'down (event-modifiers (aref key 1))))) (memq 'down (event-modifiers (aref key 1)))))
...@@ -647,7 +652,12 @@ temporarily enables it to allow getting help on disabled items and buttons." ...@@ -647,7 +652,12 @@ temporarily enables it to allow getting help on disabled items and buttons."
;; and use it as the third argument. ;; and use it as the third argument.
(and (vectorp key) (and (vectorp key)
(or (and (eventp (aref key 0)) (or (and (eventp (aref key 0))
(memq 'down (event-modifiers (aref key 0)))) (memq 'down (event-modifiers (aref key 0)))
;; However, for the C-down-mouse-2 popup
;; menu, there is no subsequent up-event. In
;; this case, the up-event is the next
;; element in the supplied vector.
(= (length key) 1))
(and (> (length key) 1) (and (> (length key) 1)
(eventp (aref key 1)) (eventp (aref key 1))
(memq 'down (event-modifiers (aref key 1))))) (memq 'down (event-modifiers (aref key 1)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment