comparison src/xdisp.c @ 13519:aee6ea2166bc

(display_text_line): Handle redisplay_end_trigger before getting the face of the next character. Reset next_face_change.

13518:9e55dae21315

		  *p2x++ = pos;
		}
	      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))
	    e_t_h = marker_position (w->redisplay_end_trigger);
	  else if (INTEGERP (w->redisplay_end_trigger))
	    e_t_h = XINT (w->redisplay_end_trigger);
	  else
	    e_t_h = ZV;

	  /* If we've gone past the place to run a hook,
	     run the hook.  */
	  if (pos >= e_t_h && e_t_h != ZV)
	    {
	      Frun_hooks (1, &Qredisplay_end_trigger_hook);
	      w->redisplay_end_trigger = Qnil;
	      e_t_h = ZV;
	    }

	  /* Compute the next place we need to stop
	     and do something special; set PAUSE.  */

	  pause = ZV;

13519:aee6ea2166bc

		  *p2x++ = pos;
		}
	      break;
	    }

	  /* Figure out where (if at all) the
	     redisplay_end_trigger-hook should run.  */
	  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);
	  else
	    e_t_h = ZV;

	  /* If we've gone past the place to run a hook,
	     run the hook.  */
	  if (pos >= e_t_h && e_t_h != ZV)
	    {
	      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.  */

	  pause = ZV;