* lisp/mouse.el (mouse-drag-mode-line-1): Modify the end-event we pushed on

unread-command-events rather than pushing yet-another event.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 680383b21f333c76a176eda103fec435e667847c..876628940c5dae7f5e2ebe6f4ca882bbacb44c78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * mouse.el (mouse-drag-mode-line-1): Modify the end-event we pushed on
+       unread-command-events rather than pushing yet-another event.
+
 2011-10-14  Eli Zaretskii  <eliz@gnu.org>
 
        * mail/sendmail.el (sendmail-query-once): Improve the wording of

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8a74782250dcb217ed4ab9880a5e8f31edde04cf..ff175288445bc6fd661ed5327e3e1e9750a7608e 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -540,11 +540,13 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
         ;; be `mouse-1', whereas if this did move the mouse, it should be
         ;; a `drag-mouse-1'.  In any case `on-link' would have been nulled
         ;; above if there had been any significant mouse movement.
-        (when (and on-link (eq 'mouse-1 (car-safe event)))
+        (when (and on-link
+                   (eq 'mouse-1 (car-safe (car unread-command-events))))
          ;; If mouse-2 has never been done by the user, it doesn't
          ;; have the necessary property to be interpreted correctly.
          (put 'mouse-2 'event-kind 'mouse-click)
-          (push (cons 'mouse-2 (cdr event)) unread-command-events))))))
+          (setcar unread-command-events
+                  (cons 'mouse-2 (cdar unread-command-events))))))))
 
 (defun mouse-drag-mode-line (start-event)
   "Change the height of a window by dragging on the mode line."