aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-10-22 19:06:13 +0200
committerMartin Rudalics2011-10-22 19:06:13 +0200
commit53ebff1ff05bc12b35de949801cd5a812e8c1cda (patch)
treec318d9636a5f81da41f244b00175ef947b3e85e4
parentd195726a7071d38a48acbeef9c307ebee3ca6ecc (diff)
downloademacs-53ebff1ff05bc12b35de949801cd5a812e8c1cda.tar.gz
emacs-53ebff1ff05bc12b35de949801cd5a812e8c1cda.zip
In mouse-drag-line correctly use window-in-direction.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/mouse.el7
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86ae2d06679..c29f9cd4c7d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,7 +12,7 @@
122011-10-22 Martin Rudalics <rudalics@gmx.at> 122011-10-22 Martin Rudalics <rudalics@gmx.at>
13 13
14 * mouse.el (mouse-drag-line): Fix minibuffer resizing broken by 14 * mouse.el (mouse-drag-line): Fix minibuffer resizing broken by
15 last fix. 15 last fix. Use window-in-direction correctly.
16 16
172011-10-21 Chong Yidong <cyd@gnu.org> 172011-10-21 Chong Yidong <cyd@gnu.org>
18 18
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 78a666419b6..9b1cf48ccdc 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -419,8 +419,9 @@ must be one of the symbols header, mode, or vertical."
419 (cond 419 (cond
420 ((eq line 'header) 420 ((eq line 'header)
421 ;; Check whether header-line can be dragged at all. 421 ;; Check whether header-line can be dragged at all.
422 (when (window-at-side-p window 'top) 422 (if (window-at-side-p window 'top)
423 (setq done t))) 423 (setq done t)
424 (setq window (window-in-direction 'above window t))))
424 ((eq line 'mode) 425 ((eq line 'mode)
425 ;; Check whether mode-line can be dragged at all. 426 ;; Check whether mode-line can be dragged at all.
426 (when (and (window-at-side-p window 'bottom) 427 (when (and (window-at-side-p window 'bottom)
@@ -436,7 +437,7 @@ must be one of the symbols header, mode, or vertical."
436 window 437 window
437 ;; If the scroll bar is on the start-event window's left, 438 ;; If the scroll bar is on the start-event window's left,
438 ;; adjust the window on the left of it. 439 ;; adjust the window on the left of it.
439 (window-in-direction 'left window))))) 440 (window-in-direction 'left window t)))))
440 441
441 ;; Start tracking. 442 ;; Start tracking.
442 (track-mouse 443 (track-mouse