* lisp/mouse.el (mouse-drag-line): Don't re-add to unread-comment-events,

since it's already done inside the loop	(bug#17819).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71d1369..fcbd0c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * mouse.el (mouse-drag-line): Don't re-add to unread-comment-events,
+       since it's already done inside the loop (bug#17819).
+
 2014-06-20  Martin Rudalics  <rudalics@gmx.at>
 
        * mouse.el (mouse-drag-line): Re-remove code initially removed
@@ -6,6 +11,9 @@
 
 2014-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * mouse.el (mouse-drag-line): Remove left-over code made redundant by
+       mouse--down-1-maybe-follows-link (bug#17819).
+
        * progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't
        align with the surrounding parent (bug#17721).
 

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 0e5e603..8cb42df 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -485,10 +485,7 @@ must be one of the symbols `header', `mode', or `vertical'."
          (unless (zerop growth)
            (setq dragged t)
            (adjust-window-trailing-edge
-            window (if (eq line 'mode) growth (- growth)) nil t))))))
-    ;; Process the terminating event.
-    (unless dragged
-      (push event unread-command-events))))
+            window (if (eq line 'mode) growth (- growth)) nil t))))))))
 
 (defun mouse-drag-mode-line (start-event)
   "Change the height of a window by dragging on the mode line."