diff options
| author | Paul Eggert | 2011-07-25 09:41:39 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-25 09:41:39 -0700 |
| commit | 985e4c56b12ef708790aebdce63ab1205822acc6 (patch) | |
| tree | 41cdade44eab885c86e1c38491092cd2e92b5542 /src/ChangeLog | |
| parent | ea8db5520cb3d1aa7c682cbcd22f80e7a9188169 (diff) | |
| parent | 2eb1f9e6a50ae13ada9a019e42fb6969f935454f (diff) | |
| download | emacs-985e4c56b12ef708790aebdce63ab1205822acc6.tar.gz emacs-985e4c56b12ef708790aebdce63ab1205822acc6.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dc81626038d..6b75029dd5c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,11 @@ | |||
| 2 | 2 | ||
| 3 | * Makefile.in (gl-stamp): move-if-change is now in build-aux. | 3 | * Makefile.in (gl-stamp): move-if-change is now in build-aux. |
| 4 | 4 | ||
| 5 | 2011-07-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 6 | |||
| 7 | * bidi.c (bidi_dump_cached_states): Fix printf format mismatch. | ||
| 8 | Found by GCC static checking and --with-wide-int on a 32-bit host. | ||
| 9 | |||
| 5 | 2011-07-25 Eli Zaretskii <eliz@gnu.org> | 10 | 2011-07-25 Eli Zaretskii <eliz@gnu.org> |
| 6 | 11 | ||
| 7 | * xdisp.c (compute_display_string_pos): Fix logic of caching | 12 | * xdisp.c (compute_display_string_pos): Fix logic of caching |