comparison src/xdisp.c @ 21028:0e9e9906db7b

(try_window_id): Use DEC_BOTH unconditionally. (display_text_line): Likewise.

21027:517de9005275

  int last_text_vpos = 0;
  int stop_vpos;
  int selective = (INTEGERP (current_buffer->selective_display)
		   ? XINT (current_buffer->selective_display)
		   : !NILP (current_buffer->selective_display) ? -1 : 0);
  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
  struct position val, bp, ep, xp, pp;
  int scroll_amount = 0;
  int delta;
  int epto, old_tick;

  if (bp.contin && bp.hpos != lmargin)
    {
      val.hpos = bp.prevhpos - width + lmargin;
      val.tab_offset = bp.tab_offset + bp.prevhpos - width;
      did_motion = 1;
      pos--;
      if (multibyte)
	DEC_POS (pos_byte);
      else
	pos_byte--;
    }

  bp.vpos = vpos;

  /* Find first visible newline after which no more is changed.  */

	}
      else if (xp.contin && xp.hpos != lmargin)
	{
	  val.hpos = xp.prevhpos - width + lmargin;
	  val.tab_offset = xp.tab_offset + bp.prevhpos - width;
	  pos--;
	  if (multibyte)
	    DEC_POS (pos_byte);
	  else
	    pos_byte--;
	}

      blank_end_of_window = 1;
      /* The following code is omitted because we maintain tab offset
	 in val.tab_offset.  */

         requested, if we hit a multi-column character, or the end of
         the line.  If so, back up.  */
      if (left_edge->vpos > vpos
          || left_edge->hpos > 0)
        {
          pos = left_edge->bufpos - 1;
	  pos_byte = left_edge->bytepos;
	  if (multibyte)
	    DEC_POS (pos_byte);
	  else
	    pos_byte--;
          hpos = left_edge->prevhpos;
        }
      else
        {
          pos = left_edge->bufpos;

	    }
	  else
	    {
	      *p1++ = fix_glyph (f, continuer, 0);
	      val.vpos = 0;
	      lastpos--;
	      if (multibyte)
		DEC_POS (lastpos_byte);
	      else
		lastpos_byte--;
	      val.tab_offset = taboffset + width;
	    }
	}
    }
  else

21028:0e9e9906db7b

  int last_text_vpos = 0;
  int stop_vpos;
  int selective = (INTEGERP (current_buffer->selective_display)
		   ? XINT (current_buffer->selective_display)
		   : !NILP (current_buffer->selective_display) ? -1 : 0);
  struct position val, bp, ep, xp, pp;
  int scroll_amount = 0;
  int delta;
  int epto, old_tick;

  if (bp.contin && bp.hpos != lmargin)
    {
      val.hpos = bp.prevhpos - width + lmargin;
      val.tab_offset = bp.tab_offset + bp.prevhpos - width;
      did_motion = 1;
      DEC_BOTH (pos, pos_byte);
    }

  bp.vpos = vpos;

  /* Find first visible newline after which no more is changed.  */

	}
      else if (xp.contin && xp.hpos != lmargin)
	{
	  val.hpos = xp.prevhpos - width + lmargin;
	  val.tab_offset = xp.tab_offset + bp.prevhpos - width;
	  DEC_BOTH (pos, pos_byte);
	}

      blank_end_of_window = 1;
      /* The following code is omitted because we maintain tab offset
	 in val.tab_offset.  */

         requested, if we hit a multi-column character, or the end of
         the line.  If so, back up.  */
      if (left_edge->vpos > vpos
          || left_edge->hpos > 0)
        {
          pos = left_edge->bufpos;
	  pos_byte = left_edge->bytepos;
	  DEC_BOTH (pos, pos_byte);
          hpos = left_edge->prevhpos;
        }
      else
        {
          pos = left_edge->bufpos;

	    }
	  else
	    {
	      *p1++ = fix_glyph (f, continuer, 0);
	      val.vpos = 0;
	      DEC_BOTH (lastpos, lastpos_byte);
	      val.tab_offset = taboffset + width;
	    }
	}
    }
  else