merge upstream

1 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e537848ea41..dd25d155c66 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2011-07-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsmenu.m (ns_popup_dialog): Add an "ok" button if no buttons
+        are specified (Bug#9168).
+
+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
+        previous display string position.  Initialize cached_prev_pos to
+        -1.  Fixes slow-down at the beginning of a buffer.
+
 2011-07-24  Eli Zaretskii  <eliz@gnu.org>
 
         * xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'