comparison src/dispnew.c @ 5885:b649c51e3f6b

(buffer_posn_from_coords): Take hscroll into account.

5884:d02095ea13a5

int
buffer_posn_from_coords (window, col, line)
     struct window *window;
     int col, line;
{
  int window_left = XFASTINT (window->left);

  /* The actual width of the window is window->width less one for the
     DISP_CONTINUE_GLYPH, and less one if it's not the rightmost
     window.  */

     (window->frame))->bufp to avoid scanning from the very top of
     the window, but it isn't maintained correctly, and I'm not even
     sure I will keep it.  */
  posn = compute_motion (startp, 0,
			 (window == XWINDOW (minibuf_window) && startp == 1
			  ? minibuf_prompt_width : 0),
			 ZV, line, col,
			 window_width, XINT (window->hscroll), 0);

  current_buffer = old_current_buffer;

  /* compute_motion considers frame points past the end of a line
     to be *after* the newline, i.e. at the start of the next line.

5885:b649c51e3f6b

int
buffer_posn_from_coords (window, col, line)
     struct window *window;
     int col, line;
{
  int hscroll = XINT (window->hscroll);
  int window_left = XFASTINT (window->left);

  /* The actual width of the window is window->width less one for the
     DISP_CONTINUE_GLYPH, and less one if it's not the rightmost
     window.  */

     (window->frame))->bufp to avoid scanning from the very top of
     the window, but it isn't maintained correctly, and I'm not even
     sure I will keep it.  */
  posn = compute_motion (startp, 0,
			 (window == XWINDOW (minibuf_window) && startp == 1
			  ? minibuf_prompt_width : 0)
			 + (hscroll ? 1 - hscroll : 0),
			 ZV, line, col,
			 window_width, hscroll, 0);

  current_buffer = old_current_buffer;

  /* compute_motion considers frame points past the end of a line
     to be *after* the newline, i.e. at the start of the next line.