Merge from trunk.

1 files changed, 27 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 49d5325c224..b5ba1d74f8a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-08-24  Paul Eggert  <eggert@cs.ucla.edu>
+2011-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer and memory overflow issues (Bug#9196).
 
@@ -422,6 +422,32 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (compute_display_string_pos): Return 2 in DISP_PROP when
+        the display spec is of the form `(space ...)'.
+        (handle_display_spec): Return the value returned by
+        handle_single_display_spec, not just 1 or zero.
+        (handle_single_display_spec): If the display spec is of the form
+        `(space ...)', and specifies display in the text area, return 2
+        rather than 1.
+        (try_cursor_movement): Check for the need to scroll more
+        accurately, and prefer exact match for point under bidi.  Don't
+        advance `row' beyond the last row of the window.
+
+        * dispextern.h (struct bidi_it): Rename the disp_prop_p member
+        into disp_prop; all users changed.
+
+        * bidi.c (bidi_fetch_char): If compute_display_string_pos returns
+        DISP_PROP = 2, substitute the u+2029 PARAGRAPH SEPARATOR character
+        for the text covered by the display property.
+
+2011-08-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buffer.c (Fbury_buffer_internal): Rename from Funrecord_buffer.
+        Change return value to nil.
+        (Frecord_buffer): Delete unused function.
+
 2011-08-24  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (Fcurrent_bidi_paragraph_direction): For unibyte