[Emacs-diffs] Changes to emacs/lisp/help.el,v

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/09/23 19:34:38

Index: help.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help.el,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -b -r1.319 -r1.320
--- help.el     19 Sep 2006 13:59:27 -0000      1.319
+++ help.el     23 Sep 2006 19:34:38 -0000      1.320
@@ -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)))))