mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 08:20:41 -08:00
Code Issues Projects Releases Wiki Activity

(display_text_line): Handle redisplay_end_trigger

Browse source 
before getting the face of the next character.  Reset next_face_change.
This commit is contained in:
Richard M. Stallman 1995-11-11 22:12:30 +00:00
parent 88e7bbf15c
commit f6fd109b05
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/xdisp.c
View file

@ -2711,19 +2711,10 @@ display_text_line (w, start, vpos, hpos, taboffset)
break;
}
#ifdef HAVE_FACES
/* Did we hit a face change? Figure out what face we should
use now. We also hit this the first time through the
loop, to see what face we should start with. */
if (pos >= next_face_change && (FRAME_WINDOW_P (f)))
current_face = compute_char_face (f, w, pos,
region_beg, region_end,
&next_face_change, pos + 50, 0);
#endif
/* Figure out where (if at all) the
redisplay_end_trigger-hook should run. */
if (MARKERP (w->redisplay_end_trigger))
if (MARKERP (w->redisplay_end_trigger)
&& XMARKER (w->redisplay_end_trigger)->buffer != 0)
e_t_h = marker_position (w->redisplay_end_trigger);
else if (INTEGERP (w->redisplay_end_trigger))
e_t_h = XINT (w->redisplay_end_trigger);
@ -2737,8 +2728,20 @@ display_text_line (w, start, vpos, hpos, taboffset)
Frun_hooks (1, &Qredisplay_end_trigger_hook);
w->redisplay_end_trigger = Qnil;
e_t_h = ZV;
/* Notice if it changed the face of this character. */
next_face_change = pos;
}
#ifdef HAVE_FACES
/* Did we hit a face change? Figure out what face we should
use now. We also hit this the first time through the
loop, to see what face we should start with. */
if (pos >= next_face_change && (FRAME_WINDOW_P (f)))
current_face = compute_char_face (f, w, pos,
region_beg, region_end,
&next_face_change, pos + 50, 0);
#endif
/* Compute the next place we need to stop
and do something special; set PAUSE. */