[Emacs-diffs] /srv/bzr/emacs/trunk r106163: Fix minibuffer resizing.

[martin rudalics]

------------------------------------------------------------
revno: 106163
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-22 11:43:09 +0200
message:
  Fix minibuffer resizing.
  
  * mouse.el (mouse-drag-line): Fix minibuffer resizing broken by
  last change.
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-21 14:48:39 +0000
+++ b/lisp/ChangeLog    2011-10-22 09:43:09 +0000
@@ -1,3 +1,8 @@
+2011-10-22  Martin Rudalics  <address@hidden>
+
+       * mouse.el (mouse-drag-line): Fix minibuffer resizing broken by
+       last fix.
+
 2011-10-21  Chong Yidong  <address@hidden>
 
        * progmodes/idlwave.el (idlwave-mode):

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2011-10-21 09:15:32 +0000
+++ b/lisp/mouse.el     2011-10-22 09:43:09 +0000
@@ -406,6 +406,7 @@
                       (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 @@
        (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.