From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 25 Jun 2011 18:31:36 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~414
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=948b98fd3c17e56b5fa606eedbe6487091f2b66d;p=emacs.git

Merge from trunk.
---

948b98fd3c17e56b5fa606eedbe6487091f2b66d
diff --cc src/ChangeLog
index 792208f7c29,c431eb1e7b2..78ab05728c6
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	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.