Merge from trunk.

1 files changed, 23 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 71ddf053dac..d477d0574b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2012-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+2012-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs (Bug#9874).
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -788,8 +788,30 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2012-02-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_overlay_strings_1): Under bidi redisplay, call
+        push_it before setting up the iterator for the first overlay
+        string, even if we have an empty string loaded.
+        (next_overlay_string): If there's an empty string on the iterator
+        stack, pop the stack.  (Bug#10903)
+
+2012-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Generalize fix for crash due to non-contiguous EMACS_INT (Bug#10780).
+        Suggested by Stefan Monnier in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00692.html>.
+        * alloc.c (widen_to_Lisp_Object): New static function.
+        (mark_memory): Also mark Lisp_Objects by fetching pointer words
+        and widening them to Lisp_Objects.  This would work even if
+        USE_LSB_TAG is defined and wide integers are used, which might
+        happen in a future version of Emacs.
+
 2012-02-25  Chong Yidong  <cyd@gnu.org>
 
+        * fileio.c (Ffile_selinux_context, Fset_file_selinux_context):
+        Doc fix.
+
         * xselect.c (Fx_selection_exists_p): Doc fix.
         (x_clipboard_manager_save_all): Print an informative message
         before saving to clipboard manager.