In mouse-drag-line remove inadvertently reintroduced code (Bug#17819).

* mouse.el (mouse-drag-line): Re-remove code initially removed
on 2013-03-09 and inadvertently reintroduced on 2013-11-30
(Bug#17819).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81a8945be11603764c595dd2872fb058951b0c3f..71d136953d48c6605b348de1ed6fde7232c3bb17 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-20  Martin Rudalics  <rudalics@gmx.at>
+
+       * mouse.el (mouse-drag-line): Re-remove code initially removed
+       on 2013-03-09 and inadvertently reintroduced on 2013-11-30
+       (Bug#17819).
+
 2014-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 48d25b877139aad7f293ee47a8de265ff4681cbc..0e5e603676b7eaa74dfa6478fba7e13e97368a05 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -390,8 +390,6 @@ must be one of the symbols `header', `mode', or `vertical'."
         (window (posn-window start))
         (frame (window-frame window))
         (minibuffer-window (minibuffer-window frame))
-         (on-link (and mouse-1-click-follows-link
-                      (mouse-on-link-p start)))
         (side (and (eq line 'vertical)
                    (or (cdr (assq 'vertical-scroll-bars
                                   (frame-parameters frame)))
@@ -489,12 +487,7 @@ must be one of the symbols `header', `mode', or `vertical'."
            (adjust-window-trailing-edge
             window (if (eq line 'mode) growth (- growth)) nil t))))))
     ;; Process the terminating event.
-    (when (and (mouse-event-p event) on-link (not dragged)
-              (mouse--remap-link-click-p start-event event))
-      ;; 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)
-      (setcar event 'mouse-2)
+    (unless dragged
       (push event unread-command-events))))
 
 (defun mouse-drag-mode-line (start-event)