comparison src/xdisp.c @ 21280:82fbf42bb989

(redisplay_window): Give byte position to FETCH_BYTE. Call pos_tab_offset appropriately. (try_window_id): Give byte position to FETCH_BYTE. Set val.bytepos to pos_byte.

21279:9d5cc9392151

	     get too much overlap, so change to the usual amount.  */
	  || pos.bufpos < startp + width / 2)
      && PT > BEGV + minibuffer_scroll_overlap
      /* If we scrolled to an actual line boundary,
	 that's different; don't ignore line boundaries.  */
      && FETCH_BYTE (pos.bufpos - 1) != '\n')
    {
      pos.bufpos = PT - minibuffer_scroll_overlap;
      pos.bytepos = CHAR_TO_BYTE (pos.bufpos);
    }
    

  /* Also, if changes reach all the way until ep.bufpos,
     it is possible that something was deleted after the
     newline before it, so the following line must be redrawn. */
  if (stop_vpos == ep.vpos
      && (ep.bufpos == BEGV
	  || FETCH_BYTE (ep.bufpos - 1) != '\n'
	  || ep.bufpos == Z - end_unchanged))
    stop_vpos = ep.vpos + 1;

  cursor_vpos = -1;
  overlay_arrow_seen = 0;

			    width, hscroll, ep.tab_offset, w);
      scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos);

      /* Is everything on frame below the changes whitespace?
	 If so, no scrolling is really necessary.  */
      for (i = ep.bufpos; i < xp.bufpos; i++)
	{
	  tem = FETCH_BYTE (i);
	  if (tem != ' ' && tem != '\n' && tem != '\t')
	    break;
	}
      if (i == xp.bufpos)
	return -2;

      XSETFASTINT (w->window_end_vpos,
		   XFASTINT (w->window_end_vpos) + scroll_amount);

      if (val.vpos) tab_offset = 0;
#endif
      if (pos != val.bufpos)
	last_text_vpos
	  /* Next line, unless prev line ended in end of buffer with no cr */
	    = vpos - (val.vpos && FETCH_BYTE (val.bufpos - 1) != '\n');
      pos = val.bufpos;
    }

  /* There are two cases:
     1) we have displayed down to the bottom of the window

      /* If we are starting display in mid-character, correct tab_offset
	 to account for passing the line that that character starts in.  */
      if (val.hpos < lmargin)
	tab_offset += width;
#endif
      val.bytepos = pos;
      while (vpos < height)
	{
	  val = *display_text_line (w, pos, val.bytepos,
				    top + vpos++, val.hpos,
				    val.tab_offset, val.ovstring_chars_done);

21280:82fbf42bb989

	     get too much overlap, so change to the usual amount.  */
	  || pos.bufpos < startp + width / 2)
      && PT > BEGV + minibuffer_scroll_overlap
      /* If we scrolled to an actual line boundary,
	 that's different; don't ignore line boundaries.  */
      && FETCH_BYTE (pos.bytepos - 1) != '\n')
    {
      pos.bufpos = PT - minibuffer_scroll_overlap;
      pos.bytepos = CHAR_TO_BYTE (pos.bufpos);
    }
    

  /* Also, if changes reach all the way until ep.bufpos,
     it is possible that something was deleted after the
     newline before it, so the following line must be redrawn. */
  if (stop_vpos == ep.vpos
      && (ep.bufpos == BEGV
	  || FETCH_BYTE (ep.bytepos - 1) != '\n'
	  || ep.bufpos == Z - end_unchanged))
    stop_vpos = ep.vpos + 1;

  cursor_vpos = -1;
  overlay_arrow_seen = 0;

			    width, hscroll, ep.tab_offset, w);
      scroll_amount = xp.vpos - XFASTINT (w->window_end_vpos);

      /* Is everything on frame below the changes whitespace?
	 If so, no scrolling is really necessary.  */
      for (i = ep.bytepos; i < xp.bytepos; i++)
	{
	  tem = FETCH_BYTE (i);
	  if (tem != ' ' && tem != '\n' && tem != '\t')
	    break;
	}
      if (i == xp.bytepos)
	return -2;

      XSETFASTINT (w->window_end_vpos,
		   XFASTINT (w->window_end_vpos) + scroll_amount);

      if (val.vpos) tab_offset = 0;
#endif
      if (pos != val.bufpos)
	last_text_vpos
	  /* Next line, unless prev line ended in end of buffer with no cr */
	    = vpos - (val.vpos && FETCH_BYTE (val.bytepos - 1) != '\n');
      pos = val.bufpos;
    }

  /* There are two cases:
     1) we have displayed down to the bottom of the window

      /* If we are starting display in mid-character, correct tab_offset
	 to account for passing the line that that character starts in.  */
      if (val.hpos < lmargin)
	tab_offset += width;
#endif
      val.bytepos = pos_byte;
      while (vpos < height)
	{
	  val = *display_text_line (w, pos, val.bytepos,
				    top + vpos++, val.hpos,
				    val.tab_offset, val.ovstring_chars_done);