Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri@jurta.org.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index aae583094f28ed3c2b94a8e8499f94132f855577..d70da316ba95cdfefe9e04f319a08479461c06e0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (redisplay_internal): Resynchronize `w' if the selected
+       window is changed inside calls to do_pending_window_change.
+       (Bug#8020)
+
 2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove no-longer needed getloadavg symbols.