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

Note:
emacs-23 2010-05-20T01:32:08Z!lekktu@gmail.com is rendered unnecessary by pre-existing 2010-05-20
trunk change.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d2aa00cbd3..1cb53d1c6a2 100644
--- 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