From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 5 Sep 2008 07:12:23 +0000 (+0000)
Subject: (window--try-to-split-window): Don't split when window
X-Git-Tag: emacs-pretest-23.0.90~3037
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7042033274974c8494bdd8104e54127fc3a3357b;p=emacs.git

(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 831b191832d..115247b54f2 100644
--- 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 8f11fd1dde9..a15d785ff6c 100644
--- 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."