[Emacs-diffs] emacs-24 r117433: * lisp/mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down

[Stefan Monnier]

------------------------------------------------------------
revno: 117433
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18212
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-08-08 12:56:50 -0400
message:
  * lisp/mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down
  event.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mouse.el                  mouse.el-20091113204419-o5vbwnq5f7feedwu-123

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-08 13:53:55 +0000
+++ b/lisp/ChangeLog    2014-08-08 16:56:50 +0000
@@ -1,3 +1,8 @@
+2014-08-08  Stefan Monnier  <address@hidden>
+
+       * mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down
+       event (bug#18212).
+
 2014-08-08  Eli Zaretskii  <address@hidden>
 
        * info.el (info): Doc fix.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2014-08-07 18:35:54 +0000
+++ b/lisp/mouse.el     2014-08-08 16:56:50 +0000
@@ -117,19 +117,14 @@
                                        'double-mouse-1 'mouse-1))
               ;; Turn the mouse-1 into a mouse-2 to follow links.
               (let ((newup (if (eq mouse-1-click-follows-link 'double)
-                                'double-mouse-2 'mouse-2))
-                    (newdown (if (eq mouse-1-click-follows-link 'double)
-                                 'double-down-mouse-2 'down-mouse-2)))
+                                'double-mouse-2 'mouse-2)))
                 ;; If mouse-2 has never been done by the user, it doesn't have
                 ;; the necessary property to be interpreted correctly.
-                (put newup 'event-kind (get (car event) 'event-kind))
-                (put newdown 'event-kind (get (car this-event) 'event-kind))
+                (unless (get newup 'event-kind)
+                  (put newup 'event-kind (get (car event) 'event-kind)))
                 (push (cons newup (cdr event)) unread-command-events)
-                ;; Modify the event in place, so read-key-sequence doesn't
-                ;; generate a second fake prefix key (see fake_prefixed_keys in
-                ;; src/keyboard.c).
-                (setcar this-event newdown)
-                (vector this-event))
+                ;; Don't change the down event, only the up-event (bug#18212).
+                nil)
             (push event unread-command-events)
             nil))))))