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

Fix bug with handling the bidi cache

Browse source 
* src/xdisp.c (redisplay_window): Save and restore the state of
the bidi cache before reusing the iterator after calls to
try_window and try_window_reusing_current_matrix.
This commit is contained in:
Eli Zaretskii 2016-08-11 18:11:26 +03:00
parent ccd0e92ecc
commit d2db5dd835
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xdisp.c
View file

@ -16122,6 +16122,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
bool last_line_misfit = false;
ptrdiff_t beg_unchanged, end_unchanged;
int frame_line_height;
void *itdata = NULL;
SET_TEXT_POS (lpoint, PT, PT_BYTE);
opoint = lpoint;
@ -16843,6 +16844,11 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
/* Run scroll hooks. */
startp = run_window_scroll_functions (window, it.current.pos);
/* We invoke try_window and try_window_reusing_current_matrix below,
and they manipulate the bidi cache. Save and restore the cache
state of our iterator, so we could continue using it after that. */
itdata = bidi_shelve_cache ();
/* Redisplay the window. */
bool use_desired_matrix = false;
if (!current_matrix_up_to_date_p
@ -16857,6 +16863,8 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
= try_window_reusing_current_matrix (w)))
use_desired_matrix = (try_window (window, startp, 0) == 1);
bidi_unshelve_cache (itdata, false);
/* If new fonts have been loaded (due to fontsets), give up. We
have to start a new redisplay since we need to re-adjust glyph
matrices. */