Merge from trunk.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a989246335d..c27b4c69bb5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2012-01-15  Paul Eggert  <eggert@cs.ucla.edu>
+2012-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs (Bug#9874).
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -788,6 +788,12 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2012-01-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Vwindow_persistent_parameters): New variable.
+        (Fset_window_configuration, save_window_save): Handle persistent
+        window parameters.
+
 2012-01-14  Eli Zaretskii  <eliz@gnu.org>
 
         * w32fns.c (signal_user_input): Don't do a QUIT, to avoid