From 9754868705d3f075230cad7ac7daa84024a2f4a9 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 20 Jun 2014 19:24:18 +0200 Subject: [PATCH] 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). --- lisp/ChangeLog | 6 ++++++ lisp/mouse.el | 9 +-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81a8945be11..71d136953d4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-06-20 Martin Rudalics + + * 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 * progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't diff --git a/lisp/mouse.el b/lisp/mouse.el index 48d25b87713..0e5e603676b 100644 --- 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) -- 2.11.4.GIT