procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a crash when visiting image files in bidi mode.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2010-05-10 21:40:26 +03:00
parent 94ecf5dae9
commit ae5e04fabc
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
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>
* Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.

8
src/xdisp.c
View file

@ -2698,8 +2698,12 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
/* 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