# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1212930158 0
# Node ID d4f0cb2dfc4d762d32b7c0f2fb829c5e9054dec4
# Parent  a1063beb10cfd57612607cf063235443494f0f4d
*** empty log message ***

diff -r a1063beb10cf -r d4f0cb2dfc4d lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 08 12:59:39 2008 +0000
+++ b/lisp/ChangeLog	Sun Jun 08 13:02:38 2008 +0000
@@ -1,3 +1,16 @@
+2008-06-08  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (split-height-threshold, split-width-threshold): Add
+	choice nil.
+	(split-window-preferred-function): Allow either nil or a function.
+	(window--splittable-p, window--try-to-split-window): Handle
+	changed option values.
+
+	(window--frame-usable-p): Handle nil argument.
+
+	(display-buffer): Call get-lru-window when pop-up-windows is nil
+	and window can't be split.
+
 2008-06-08  Michael Albinus  <michael.albinus@gmx.de>
 
 	* uniquify.el (uniquify-get-proposed-name): Handle remote files.