Merge from emacs-23

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index fcf8218d67065f6998666355bfbb0fbbfe544adc..355376a886b7d8a615c0c5526f1c680cc3e3e1cc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-22  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.c (select_window): New function.
+       (Fselect_window): Call it.
+       (inhibit_point_swap): Variable deleted.
+       (Fset_window_configuration): Call select_window directly.
+
 2011-01-22  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (constrainFrameRect): Only constrain the first time called.