From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 31 Jan 2009 22:14:53 +0000 (+0000)
Subject: (mouse-drag-mode-line-1): Obey mouse-1-click-follows-link.
X-Git-Tag: emacs-pretest-23.0.90~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ceaabbbde729b0468bfc72ba967e8463cb103dcf;p=emacs.git

(mouse-drag-mode-line-1): Obey mouse-1-click-follows-link.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d3de0b1efe..959d1fb246b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* mouse.el (mouse-drag-mode-line-1): Obey mouse-1-click-follows-link.
+
 	* progmodes/ebrowse.el:
 	* international/robin.el:
 	* emulation/viper-util.el:
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 5eef35de097..cdb89caeeca 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -419,6 +419,10 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
 	 (start-event-window (posn-window start))
 	 (start-event-frame (window-frame start-event-window))
 	 (start-nwindows (count-windows t))
+         (on-link (and mouse-1-click-follows-link
+		       (or mouse-1-click-in-non-selected-windows
+			   (eq (posn-window start) (selected-window)))
+                       (mouse-on-link-p start)))
 	 (minibuffer (frame-parameter nil 'minibuffer))
 	 should-enlarge-minibuffer event mouse y top bot edges wconfig growth)
     (track-mouse
@@ -491,6 +495,11 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
 			    (one-window-p t))
 		   (error "Attempt to resize sole window"))
 
+                 ;; If we ever move, make sure we don't mistakenly treat
+                 ;; some unexpected `mouse-1' final event as a sign that
+                 ;; this whole drag was nothing more than a click.
+                 (if (/= growth 0) (setq on-link nil))
+
 		 ;; grow/shrink minibuffer?
 		 (if should-enlarge-minibuffer
 		     (unless resize-mini-windows
@@ -519,7 +528,14 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
 				    (nth 1 (window-edges
 					    ;; Choose right window.
 					    start-event-window)))))
-		   (set-window-configuration wconfig)))))))))
+		   (set-window-configuration wconfig)))))
+
+        ;; Presumably if this was just a click, the last event should
+        ;; be `mouse-1', whereas if this did move the mouse, it should be
+        ;; a `drag-mouse-1'.  In any case `on-link' would have been nulled
+        ;; above if there had been any significant mouse movement.
+        (when (and on-link (eq 'mouse-1 (car-safe event)))
+          (push (cons 'mouse-2 (cdr event)) unread-command-events))))))
 
 (defun mouse-drag-mode-line (start-event)
   "Change the height of a window by dragging on the mode line."