From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Jul 2011 16:41:39 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=985e4c56b12ef708790aebdce63ab1205822acc6;p=emacs.git

Merge from trunk.
---

985e4c56b12ef708790aebdce63ab1205822acc6
diff --cc src/ChangeLog
index dc81626038d,3fc8067e114..6b75029dd5c
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* Makefile.in (gl-stamp): move-if-change is now in build-aux.
 +
+ 2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* bidi.c (bidi_dump_cached_states): Fix printf format mismatch.
+ 	Found by GCC static checking and --with-wide-int on a 32-bit host.
+ 
  2011-07-25  Eli Zaretskii  <eliz@gnu.org>
  
  	* xdisp.c (compute_display_string_pos): Fix logic of caching