comparison src/indent.c @ 16926:3baea3418dec

(pos_tab_offset): Take the width of the minibuffer prompt into account. (vmotion): In calls to compute_motion use a value for tab_offset that is corrected by the minibuffer prompt width.

16925:2b35e4ccbb32

{
  int opoint = PT;
  int col;
  int width = window_internal_width (w) - 1;

  if (pos == BEGV || FETCH_CHAR (pos - 1) == '\n')
    return 0;
  TEMP_SET_PT (pos);
  col = current_column ();
  TEMP_SET_PT (opoint);
  return col - (col % width);
}


/* Fvertical_motion and vmotion */

	  pos = *compute_motion (XFASTINT (prevline), 0,
				 lmargin + (XFASTINT (prevline) == BEG
					    ? start_hpos : 0),
				 0,
				 from, 1 << (BITS_PER_INT - 2), 0,
				 width, hscroll, 0, w);
	  vpos -= pos.vpos;
	  first = 0;
	  from = XFASTINT (prevline);
	}

      pos = *compute_motion (XFASTINT (prevline), 0,
			     lmargin + (XFASTINT (prevline) == BEG
					? start_hpos : 0),
			     0,
			     from, 1 << (BITS_PER_INT - 2), 0,
			     width, hscroll, 0, w);
      did_motion = 1;
    }
  else
    {
      pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
      pos.vpos = 0;
      did_motion = 0;
    }
  return compute_motion (from, vpos, pos.hpos, did_motion,
			 ZV, vtarget, - (1 << (BITS_PER_INT - 2)),
			 width, hscroll, pos.vpos * width, w);
}

DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
  "Move point to start of the screen line LINES lines down.\n\
If LINES is negative, this means moving up.\n\

16926:3baea3418dec

{
  int opoint = PT;
  int col;
  int width = window_internal_width (w) - 1;

  if (pos == BEGV)
    return MINI_WINDOW_P (w) ? -minibuf_prompt_width : 0;
  if (FETCH_CHAR (pos - 1) == '\n')
    return 0;
  TEMP_SET_PT (pos);
  col = current_column ();
  TEMP_SET_PT (opoint);
  /* In the continuation of the first line in a minibuffer we must
     take the width of the prompt into account.  */
  if (MINI_WINDOW_P (w) && col >= width - minibuf_prompt_width
      && find_next_newline_no_quit (pos, -1) == BEGV)
    return col - (col + minibuf_prompt_width) % width;
  return col - (col % width);
}


/* Fvertical_motion and vmotion */

	  pos = *compute_motion (XFASTINT (prevline), 0,
				 lmargin + (XFASTINT (prevline) == BEG
					    ? start_hpos : 0),
				 0,
				 from, 1 << (BITS_PER_INT - 2), 0,
				 width, hscroll,
				 /* This compensates for start_hpos
				    so that a tab as first character
				    still occupies 8 columns.  */
				 (XFASTINT (prevline) == BEG
				  ? -start_hpos : 0),
				 w);
	  vpos -= pos.vpos;
	  first = 0;
	  from = XFASTINT (prevline);
	}

      pos = *compute_motion (XFASTINT (prevline), 0,
			     lmargin + (XFASTINT (prevline) == BEG
					? start_hpos : 0),
			     0,
			     from, 1 << (BITS_PER_INT - 2), 0,
			     width, hscroll,
			     (XFASTINT (prevline) == BEG ? -start_hpos : 0),
			     w);
      did_motion = 1;
    }
  else
    {
      pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
      pos.vpos = 0;
      did_motion = 0;
    }
  return compute_motion (from, vpos, pos.hpos, did_motion,
			 ZV, vtarget, - (1 << (BITS_PER_INT - 2)),
			 width, hscroll,
			 pos.vpos * width - (from == BEG ? start_hpos : 0),
			 w);
}

DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
  "Move point to start of the screen line LINES lines down.\n\
If LINES is negative, this means moving up.\n\