Mercurial > emacs
comparison src/window.c @ 34384:9669bb49fca2
(Fmove_to_window_line): Skip past any partially visible first line.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 08 Dec 2000 18:56:35 +0000 |
parents | f9d7bc96177b |
children | eaeb04956022 |
comparison
equal
deleted
inserted
replaced
34383:87e249cf993b | 34384:9669bb49fca2 |
---|---|
4480 struct frame *f = XFRAME (w->frame); | 4480 struct frame *f = XFRAME (w->frame); |
4481 int rest = height - bottom_y; | 4481 int rest = height - bottom_y; |
4482 int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); | 4482 int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); |
4483 it.vpos += lines; | 4483 it.vpos += lines; |
4484 } | 4484 } |
4485 #if 0 | 4485 |
4486 else if (it.current_y < height && bottom_y > height) | |
4487 /* Partially visible line at the bottom. */ | |
4488 ++it.vpos; | |
4489 #endif | |
4490 | |
4491 return it.vpos; | 4486 return it.vpos; |
4492 } | 4487 } |
4493 | 4488 |
4494 | 4489 |
4495 | 4490 |
4526 { | 4521 { |
4527 arg = Fprefix_numeric_value (arg); | 4522 arg = Fprefix_numeric_value (arg); |
4528 if (XINT (arg) < 0) | 4523 if (XINT (arg) < 0) |
4529 XSETINT (arg, XINT (arg) + lines); | 4524 XSETINT (arg, XINT (arg) + lines); |
4530 } | 4525 } |
4526 | |
4527 if (w->vscroll) | |
4528 /* Skip past a partially visible first line. */ | |
4529 XSETINT (arg, XINT (arg) + 1); | |
4531 | 4530 |
4532 return Fvertical_motion (arg, window); | 4531 return Fvertical_motion (arg, window); |
4533 } | 4532 } |
4534 | 4533 |
4535 | 4534 |