# HG changeset patch # User Chong Yidong # Date 1159040078 0 # Node ID 40a575bcdf72c177d61c5c8de01629ca8a8d9496 # Parent 6953eaae7734b0c6d18287459d12eb7878154784 * help.el (describe-key-briefly, describe-key): Don't expect an extra up event if a down-event is generated by a popup menu. diff -r 6953eaae7734 -r 40a575bcdf72 lisp/ChangeLog --- a/lisp/ChangeLog Sat Sep 23 19:06:28 2006 +0000 +++ b/lisp/ChangeLog Sat Sep 23 19:34:38 2006 +0000 @@ -1,3 +1,8 @@ +2006-09-23 Chong Yidong + + * 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 (tiny change) * textmodes/ispell.el (ispell-change-dictionary): Don't check the diff -r 6953eaae7734 -r 40a575bcdf72 lisp/help.el --- a/lisp/help.el Sat Sep 23 19:06:28 2006 +0000 +++ b/lisp/help.el Sat Sep 23 19:34:38 2006 +0000 @@ -572,7 +572,12 @@ ;; event then is in the second element of the vector. (and (vectorp key) (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) (eventp (aref key 1)) (memq 'down (event-modifiers (aref key 1))))) @@ -647,7 +652,12 @@ ;; and use it as the third argument. (and (vectorp key) (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) (eventp (aref key 1)) (memq 'down (event-modifiers (aref key 1)))))