comparison src/xdisp.c @ 19045:59ccb8fd4ee1

(redisplay_window): Fix previous change. (decode_mode_spec_coding): If multibyte chars disabled. display only the eol flag.

19044:192305191a1f

      && INTEGERP (w->window_end_vpos)
      && XFASTINT (w->window_end_vpos) < XFASTINT (w->height)
      && !EQ (window, minibuf_window))
    {
      int this_scroll_margin = scroll_margin;

      /* Find where PT is located now on the frame.  */
      if (PT == w->last_point)
	{
	  pos.hpos = (w->last_point_x
		      + (hscroll ? 1 - hscroll : 0)
		      - WINDOW_LEFT_MARGIN (w));
	  pos.vpos = w->last_point_y;
	  pos.bufpos = PT;
	}
      else if (PT > w->last_point)
	{
	  pos = *compute_motion (w->last_point, w->last_point_y,
				 w->last_point_x + (hscroll ? 1 - hscroll : 0),
				 0,
				 PT, height,
				 /* BUG FIX: See the comment of
				    Fpos_visible_in_window_p (window.c).  */
				 - (1 << (BITS_PER_SHORT - 1)),
				 width, hscroll,

     Lisp_Object coding_system;
     register char *buf;
     int eol_flag;
{
  Lisp_Object val;

  val = coding_system;

  if (NILP (val))		/* Not yet decided.  */
    {
      *buf++ = '-';
      if (eol_flag)
	*buf++ = eol_mnemonic_undecided;
      /* Don't mention EOL conversion if it isn't decided.  */
    }
  else

	  val = Fget (val, Qcoding_system);
	  if (NILP (eolvalue))
	    eolvalue = Fget (val, Qeol_type);
	}

      *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
      if (eol_flag)
	{
	  /* The EOL conversion we are using.  */
	  int eoltype;
	  /* The EOL conversion that is normal on this system.  */

19045:59ccb8fd4ee1

      && INTEGERP (w->window_end_vpos)
      && XFASTINT (w->window_end_vpos) < XFASTINT (w->height)
      && !EQ (window, minibuf_window))
    {
      int this_scroll_margin = scroll_margin;
      int last_point_y = w->last_point_y - XINT (w->top);
      int last_point_x = (w->last_point_x
			  + (hscroll ? 1 - hscroll : 0)
			  - WINDOW_LEFT_MARGIN (w));

      /* Find where PT is located now on the frame.  */
      /* Check just_this_one as a way of verifying that the 
	 window edges have not changed.  */
      if (PT == w->last_point && just_this_one)
	{
	  pos.hpos = last_point_x;
	  pos.vpos = last_point_y;
	  pos.bufpos = PT;
	}
      else if (PT > w->last_point && w->last_point > startp && just_this_one)
	{
	  pos = *compute_motion (w->last_point, last_point_y, last_point_x, 0,
				 PT, height,
				 /* BUG FIX: See the comment of
				    Fpos_visible_in_window_p (window.c).  */
				 - (1 << (BITS_PER_SHORT - 1)),
				 width, hscroll,

     Lisp_Object coding_system;
     register char *buf;
     int eol_flag;
{
  Lisp_Object val;
  int multibyte = !NILP (current_buffer->enable_multibyte_characters);

  val = coding_system;

  if (NILP (val))		/* Not yet decided.  */
    {
      if (multibyte)
	*buf++ = '-';
      if (eol_flag)
	*buf++ = eol_mnemonic_undecided;
      /* Don't mention EOL conversion if it isn't decided.  */
    }
  else

	  val = Fget (val, Qcoding_system);
	  if (NILP (eolvalue))
	    eolvalue = Fget (val, Qeol_type);
	}

      if (multibyte)
	*buf++ = XFASTINT (XVECTOR (val)->contents[1]);

      if (eol_flag)
	{
	  /* The EOL conversion we are using.  */
	  int eoltype;
	  /* The EOL conversion that is normal on this system.  */