Commit ae5e04fa authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent 94ecf5da
2010-05-10 Eli Zaretskii <eliz@gnu.org>
* 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 <rgm@gnu.org> 2010-05-10 Glenn Morris <rgm@gnu.org>
   
* Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.
......
...@@ -2698,8 +2698,12 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id) ...@@ -2698,8 +2698,12 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
/* Are multibyte characters enabled in current_buffer? */ /* Are multibyte characters enabled in current_buffer? */
it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
   
/* Do we need to reorder bidirectional text? */ /* Do we need to reorder bidirectional text? Not if this is a
it->bidi_p = !NILP (current_buffer->bidi_display_reordering); 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. */ /* Non-zero if we should highlight the region. */
highlight_region_p highlight_region_p
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment