Merge from trunk.

diff --git a/src/ChangeLog b/src/ChangeLog
index dc81626038d01afb37e67abf42d2caf73528000b..6b75029dd5cfac1ad2e8bf9355532fe939ae3da0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,11 @@
 
        * 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

diff --git a/src/bidi.c b/src/bidi.c
index c83ee5499239c37a54b37f01c0272206503286b6..412dc94cb8681a47012c454865e7d029c2748327 100644 (file)
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2308,7 +2308,7 @@ bidi_dump_cached_states (void)
       fprintf (stderr, "The cache is empty.\n");
       return;
     }
-  fprintf (stderr, "Total of  %"pD"d state%s in cache:\n",
+  fprintf (stderr, "Total of  %"pI"d state%s in cache:\n",
           bidi_cache_idx, bidi_cache_idx == 1 ? "" : "s");
 
   for (i = bidi_cache[bidi_cache_idx - 1].charpos; i > 0; i /= 10)