Merge from emacs-24; up to 2014-07-09T02:04:12Z!rgm@gnu.org

1 files changed, 15 insertions, 2 deletions

diff --git a/lisp/mouse.el b/lisp/mouse.el
index a10f4d67593..93bd6283158 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -396,7 +396,16 @@ must be one of the symbols `header', `mode', or `vertical'."
       ;; Check whether header-line can be dragged at all.
       (if (window-at-side-p window 'top)
 	  (setq draggable nil)
-	(setq height (/ (window-header-line-height window) 2))
+	;; window-pixel-edges includes the header and mode lines, so
+	;; we need to account for that when calculating window growth.
+	;; On GUI frames, assume the mouse is approximately in the
+	;; middle of the header/mode line, so we need only half the
+	;; height in pixels.
+	(setq height
+	      (cond
+	       ((display-graphic-p frame)
+		(/ (window-header-line-height window) 2))
+	       (t  (window-header-line-height window))))
 	(setq window (window-in-direction 'above window t))))
      ((eq line 'mode)
       ;; Check whether mode-line can be dragged at all.
@@ -411,7 +420,11 @@ must be one of the symbols `header', `mode', or `vertical'."
 			     (eq minibuffer-window
 				 (active-minibuffer-window))))))
 	  (setq draggable nil)
-	(setq height (/ (window-mode-line-height window) 2))))
+	(setq height
+	      (cond
+	       ((display-graphic-p frame)
+		(/ (window-mode-line-height window) 2))
+	       (t  (window-mode-line-height window))))))
      ((eq line 'vertical)
       ;; Get the window to adjust for the vertical case.  If the scroll
       ;; bar is on the window's right or we drag a vertical divider,