1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 11e657cffa9..9e0f92f557e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-07  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fsplit_window_internal): Set combination limit of
+        new parent window to t iff Vwindow_combination_limit is t;
+        fixing a regression introduced with the change from 2012-09-22.
+        (Fwindow_combination_limit, Fset_window_combination_limit): Fix
+        doc-strings.
+
 2012-11-06  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (try_scrolling): Fix correction of aggressive-scroll