(window--try-to-split-window): Don't split when window

is not splittable in last disjunct.  (Bug#888)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 831b191832dff02e414c24bb4810d0ac92c96000..115247b54f2e76aacababff369aa6fda840c33d8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-05  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (window--try-to-split-window): Don't split when window
+       is not splittable in last disjunct.  (Bug#888)
+
 2008-09-05  Kenichi Handa  <handa@m17n.org>
 
        * language/tibetan.el: Fix setting of composition-function-table.
@@ -57,7 +62,7 @@
 2008-09-02  Martin Rudalics  <rudalics@gmx.at>
 
        * calc/calc.el (calc-dispatch-map): Fix handling of upcased and
-       control-prefixed keys.  (Bug #835)
+       control-prefixed keys.  (Bug#835)
 
 2008-09-02  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/lisp/window.el b/lisp/window.el
index 8f11fd1dde9996af125effb534c2d793acde267d..a15d785ff6c2936b15c1863b2060efa382512dbd 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -837,8 +837,8 @@ by `split-window' or `split-window-preferred-function'."
               ;; minibuffer window, attempt to split it vertically
               ;; disregarding the value of `split-height-threshold'.
               (let ((split-height-threshold 0))
-                (window--splittable-p window)
-                (split-window window)))))))
+                (and (window--splittable-p window)
+                     (split-window window))))))))
 
 (defun window--frame-usable-p (frame)
   "Return frame FRAME if it can be used to display another buffer."