summaryrefslogtreecommitdiff
path: root/lisp/mouse.el
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2014-06-20 19:24:18 +0200
committerMartin Rudalics <rudalics@gmx.at>2014-06-20 19:24:18 +0200
commit9754868705d3f075230cad7ac7daa84024a2f4a9 (patch)
treec92490fbf221dc75d7686fa85f2fe46298321d53 /lisp/mouse.el
parent9e248ebdc71b051911ba1a68187d300bfff39fb3 (diff)
downloademacs-9754868705d3f075230cad7ac7daa84024a2f4a9.tar.gz
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).
Diffstat (limited to 'lisp/mouse.el')
-rw-r--r--lisp/mouse.el9
1 files changed, 1 insertions, 8 deletions
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)