[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117267: In mouse-drag-line remove inadvertently
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] emacs-24 r117267: In mouse-drag-line remove inadvertently reintroduced code (Bug#17819). |
Date: |
Fri, 20 Jun 2014 17:24:40 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117267
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-06-20 19:24:18 +0200
message:
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).
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/mouse.el mouse.el-20091113204419-o5vbwnq5f7feedwu-123
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-06-20 14:23:30 +0000
+++ b/lisp/ChangeLog 2014-06-20 17:24:18 +0000
@@ -1,3 +1,9 @@
+2014-06-20 Martin Rudalics <address@hidden>
+
+ * 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 <address@hidden>
* progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't
=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el 2014-05-31 12:32:36 +0000
+++ b/lisp/mouse.el 2014-06-20 17:24:18 +0000
@@ -390,8 +390,6 @@
(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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117267: In mouse-drag-line remove inadvertently reintroduced code (Bug#17819).,
Martin Rudalics <=