[Emacs-diffs] /srv/bzr/emacs/trunk r100218: Fix a crash when visiting image files in bidi mode.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100218
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-10 21:40:26 +0300
message:
  Fix a crash when visiting image files in bidi mode.
  
   xdisp.c (init_iterator): Don't turn on bidi reordering in unibyte buffers.
   See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html
   for the details.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-10 02:16:09 +0000
+++ b/src/ChangeLog     2010-05-10 18:40:26 +0000
@@ -1,3 +1,9 @@
+2010-05-10  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (init_iterator): Don't turn on bidi reordering in
+       unibyte buffers.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.
+
 2010-05-10  Glenn Morris  <address@hidden>
 
        * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-05-03 15:01:21 +0000
+++ b/src/xdisp.c       2010-05-10 18:40:26 +0000
@@ -2698,8 +2698,12 @@
   /* Are multibyte characters enabled in current_buffer?  */
   it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
 
-  /* Do we need to reorder bidirectional text?  */
-  it->bidi_p = !NILP (current_buffer->bidi_display_reordering);
+  /* Do we need to reorder bidirectional text?  Not if this is a
+     unibyte buffer: all single-byte characters are by definition
+     strong L2R, so no reordering is needed.  And bidi.c doesn't
+     support unibyte buffers anyway.  */
+  it->bidi_p
+    = !NILP (current_buffer->bidi_display_reordering) && it->multibyte_p;
 
   /* Non-zero if we should highlight the region.  */
   highlight_region_p