Fix minibuffer resizing.

* mouse.el (mouse-drag-line): Fix minibuffer resizing broken by
last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42c2a9ebfb4c6efddee41f4ce3149ba7b9b52191..f2d0ec37b32a87126a21833eb0901f26ba9c538d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-22  Martin Rudalics  <rudalics@gmx.at>
+
+       * mouse.el (mouse-drag-line): Fix minibuffer resizing broken by
+       last fix.
+
 2011-10-21  Chong Yidong  <cyd@gnu.org>
 
        * progmodes/idlwave.el (idlwave-mode):

diff --git a/lisp/mouse.el b/lisp/mouse.el
index ffa3db738acde217e03285df8674a1c28ea64830..78a666419b638865cdcf97b6a8f04c37ef7e122b 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -406,6 +406,7 @@ must be one of the symbols header, mode, or vertical."
                       (mouse-on-link-p start)))
         (enlarge-minibuffer
          (and (eq line 'mode)
+              (not resize-mini-windows)
               (eq (window-frame minibuffer-window) frame)
               (not (one-window-p t frame))
               (= (nth 1 (window-edges minibuffer-window))
@@ -422,7 +423,8 @@ must be one of the symbols header, mode, or vertical."
        (setq done t)))
      ((eq line 'mode)
       ;; Check whether mode-line can be dragged at all.
-      (when (window-at-side-p window 'bottom)
+      (when (and (window-at-side-p window 'bottom)
+                (not enlarge-minibuffer))
        (setq done t)))
      ((eq line 'vertical)
       ;; Get the window to adjust for the vertical case.