# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1233440093 0
# Node ID c65ecdf80c279d285308fd8393aa520e76ab60ba
# Parent  c55394eee0de5f6ac31e0251a40c254bc33da32f
(mouse-drag-mode-line-1): Obey mouse-1-click-follows-link.

diff -r c55394eee0de -r c65ecdf80c27 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 31 22:10:22 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 31 22:14:53 2009 +0000
@@ -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 -r c55394eee0de -r c65ecdf80c27 lisp/mouse.el
--- a/lisp/mouse.el	Sat Jan 31 22:10:22 2009 +0000
+++ b/lisp/mouse.el	Sat Jan 31 22:14:53 2009 +0000
@@ -419,6 +419,10 @@
 	 (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 @@
 			    (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 @@
 				    (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."