[Emacs-diffs] /srv/bzr/emacs/trunk r106085: * lisp/mouse.el (mouse-drag-mode-line-1): Modify the end-event we pushed on

[Stefan Monnier]

------------------------------------------------------------
revno: 106085
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-10-14 14:36:33 -0400
message:
  * lisp/mouse.el (mouse-drag-mode-line-1): Modify the end-event we pushed on
  unread-command-events rather than pushing yet-another event.
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-14 13:49:32 +0000
+++ b/lisp/ChangeLog    2011-10-14 18:36:33 +0000
@@ -1,3 +1,8 @@
+2011-10-14  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/sendmail.el (sendmail-query-once): Improve the wording of

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2011-09-24 18:38:20 +0000
+++ b/lisp/mouse.el     2011-10-14 18:36:33 +0000
@@ -540,11 +540,13 @@
         ;; 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."