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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/09/24 20:43:32

Index: help.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help.el,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -b -r1.320 -r1.321
--- help.el     23 Sep 2006 19:34:38 -0000      1.320
+++ help.el     24 Sep 2006 20:43:32 -0000      1.321
@@ -571,16 +571,9 @@
           ;; down-events on scroll bars and mode lines: the actual
           ;; 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)))
-                        ;; 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)))))
+               (let ((last-idx (1- (length key))))
+                 (and (eventp (aref key last-idx))
+                      (memq 'down (event-modifiers (aref key last-idx)))))
                (read-event))
           (list
            key
@@ -648,9 +641,14 @@
           (list
            key
            (prefix-numeric-value current-prefix-arg)
-           ;; If KEY is a down-event, read the corresponding up-event
-           ;; and use it as the third argument.
+           ;; If KEY is a down-event, read and discard the
+           ;; corresponding up-event.  Note that there are also
+           ;; down-events on scroll bars and mode lines: the actual
+           ;; event then is in the second element of the vector.
            (and (vectorp key)
+                (let ((last-idx (1- (length key))))
+                  (and (eventp (aref key last-idx))
+                       (memq 'down (event-modifiers (aref key last-idx)))))
                 (or (and (eventp (aref key 0))
                          (memq 'down (event-modifiers (aref key 0)))
                          ;; However, for the C-down-mouse-2 popup