comparison src/window.c @ 36202:8d5b7f742286

(Fmove_to_window_line): Undo last change. (displayed_window_lines): Call line_bottom_y to determine the line's bottom position.

36201:32505f3d0441

    old_buffer = NULL;

  SET_TEXT_POS_FROM_MARKER (start, w->start);
  start_display (&it, w, start);
  move_it_vertically (&it, height);

  if (old_buffer)
    set_buffer_internal (old_buffer);

  bottom_y = it.current_y + it.max_ascent + it.max_descent;

  if (bottom_y > it.current_y && bottom_y <= it.last_visible_y)
    /* Hit a line without a terminating newline.  */
    it.vpos++;

  /* Add in empty lines at the bottom of the window.  */
  if (bottom_y < height)
    {
      struct frame *f = XFRAME (w->frame);
      int rest = height - bottom_y;
      int lines = rest / CANON_Y_UNIT (f);
      it.vpos += lines;
    }

  return it.vpos;
}

      arg = Fprefix_numeric_value (arg);
      if (XINT (arg) < 0)
	XSETINT (arg, XINT (arg) + lines);
    }

#if 0 /* I don't understand why this is done.  Among other things,
         it means that C-u 0 M-r moves to line 1, and C-u -1 M-r
         moves to the line below the window end.  2000-02-05, gerd */
  if (w->vscroll)
    /* Skip past a partially visible first line.  */
    XSETINT (arg, XINT (arg) + 1);
#endif

  return Fvertical_motion (arg, window);
}

36202:8d5b7f742286

    old_buffer = NULL;

  SET_TEXT_POS_FROM_MARKER (start, w->start);
  start_display (&it, w, start);
  move_it_vertically (&it, height);
  bottom_y = line_bottom_y (&it);

  /* Add in empty lines at the bottom of the window.  */
  if (bottom_y < height)
    {
      int uy = CANON_Y_UNIT (it.f);
      it.vpos += (height - bottom_y + uy - 1) / uy;
    }

  if (old_buffer)
    set_buffer_internal (old_buffer);

  return it.vpos;
}

      arg = Fprefix_numeric_value (arg);
      if (XINT (arg) < 0)
	XSETINT (arg, XINT (arg) + lines);
    }

  /* Skip past a partially visible first line.  */
  if (w->vscroll)
    XSETINT (arg, XINT (arg) + 1);

  return Fvertical_motion (arg, window);
}