Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index b8b3d2a1a9c01dda2c62bf55ba5790807ada1e09..c431eb1e7b23e0cffee4705201971623777e4672 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * dispnew.c (scrolling_window): Before scrolling, turn off a
+       mouse-highlight in the window being scrolled.
+
 2011-06-24  Juanma Barranquero  <lekktu@gmail.com>
 
        Move DEFSYM to lisp.h and use everywhere.