Merge from trunk.

2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 792208f7c29..78ab05728c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,11 @@
         Use gnulib's dup2 module instead of rolling our own.
         * sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
 
+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.
diff --git a/src/dispnew.c b/src/dispnew.c
index c33442d5048..8691c921853 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4543,6 +4543,7 @@ scrolling_window (struct window *w, int header_line_p)
         /* Copy on the display.  */
         if (r->current_y != r->desired_y)
           {
+            rif->clear_window_mouse_face (w);
             rif->scroll_run_hook (w, r);
 
             /* Invalidate runs that copy from where we copied to.  */