Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d2aa00cbd3869e6bf8cd4a0338276e50d90bdbb..1cb53d1c6a23cda7553c3fb37587a1876782921d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-15  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.c (inhibit_point_swap): New variable.
+       (Fselect_window): If inhibit_point_swap is nonzero, avoid swapping
+       point this time.
+       (Fset_window_configuration): Set inhibit_point_swap to 1 instead
+       of setting selected_window to nil (Bug#7728).
+
 2011-01-11  Tassilo Horn  <tassilo@member.fsf.org>
 
        * image.c (imagemagick_load_image, Finit_image_library): Free