Merge from mainline.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2265f12138e..8f3c4056495 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
         * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro.
@@ -33,6 +33,14 @@
         ($(lib)/libgnu.a): New rule.
         (temacs$(EXEEXT)): Also link $(lib)/libgnu.a.
 
+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
@@ -29539,7 +29547,8 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 2007, 2008, 2009, 2010, 2011
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.