diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/window.c b/src/window.c index b7747b5ad79..0d299b7cd93 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4858,7 +4858,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 4858 | looking at an image that is taller that the window height. */ | 4858 | looking at an image that is taller that the window height. */ |
| 4859 | while (start_pos == IT_CHARPOS (it) | 4859 | while (start_pos == IT_CHARPOS (it) |
| 4860 | && start_pos > BEGV) | 4860 | && start_pos > BEGV) |
| 4861 | move_it_by_lines (&it, -1, 1); | 4861 | move_it_by_lines (&it, -1); |
| 4862 | } | 4862 | } |
| 4863 | else if (dy > 0) | 4863 | else if (dy > 0) |
| 4864 | { | 4864 | { |
| @@ -4868,11 +4868,11 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 4868 | looking at an image that is taller that the window height. */ | 4868 | looking at an image that is taller that the window height. */ |
| 4869 | while (start_pos == IT_CHARPOS (it) | 4869 | while (start_pos == IT_CHARPOS (it) |
| 4870 | && start_pos < ZV) | 4870 | && start_pos < ZV) |
| 4871 | move_it_by_lines (&it, 1, 1); | 4871 | move_it_by_lines (&it, 1); |
| 4872 | } | 4872 | } |
| 4873 | } | 4873 | } |
| 4874 | else | 4874 | else |
| 4875 | move_it_by_lines (&it, n, 1); | 4875 | move_it_by_lines (&it, n); |
| 4876 | 4876 | ||
| 4877 | /* We failed if we find ZV is already on the screen (scrolling up, | 4877 | /* We failed if we find ZV is already on the screen (scrolling up, |
| 4878 | means there's nothing past the end), or if we can't start any | 4878 | means there's nothing past the end), or if we can't start any |
| @@ -4983,7 +4983,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 4983 | while (it.current_y < this_scroll_margin) | 4983 | while (it.current_y < this_scroll_margin) |
| 4984 | { | 4984 | { |
| 4985 | int prev = it.current_y; | 4985 | int prev = it.current_y; |
| 4986 | move_it_by_lines (&it, 1, 1); | 4986 | move_it_by_lines (&it, 1); |
| 4987 | if (prev == it.current_y) | 4987 | if (prev == it.current_y) |
| 4988 | break; | 4988 | break; |
| 4989 | } | 4989 | } |
| @@ -5017,7 +5017,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 5017 | partial_p = it.current_y + it.ascent + it.descent > it.last_visible_y; | 5017 | partial_p = it.current_y + it.ascent + it.descent > it.last_visible_y; |
| 5018 | else | 5018 | else |
| 5019 | { | 5019 | { |
| 5020 | move_it_by_lines (&it, 1, 1); | 5020 | move_it_by_lines (&it, 1); |
| 5021 | partial_p = it.current_y > it.last_visible_y; | 5021 | partial_p = it.current_y > it.last_visible_y; |
| 5022 | } | 5022 | } |
| 5023 | 5023 | ||
| @@ -5044,7 +5044,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 5044 | /* The last line was only partially visible, so back up two | 5044 | /* The last line was only partially visible, so back up two |
| 5045 | lines to make sure we're on a fully visible line. */ | 5045 | lines to make sure we're on a fully visible line. */ |
| 5046 | { | 5046 | { |
| 5047 | move_it_by_lines (&it, -2, 0); | 5047 | move_it_by_lines (&it, -2); |
| 5048 | SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); | 5048 | SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
| 5049 | } | 5049 | } |
| 5050 | else | 5050 | else |
| @@ -5587,14 +5587,14 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5587 | start_display (&it, w, pt); | 5587 | start_display (&it, w, pt); |
| 5588 | 5588 | ||
| 5589 | /* Be sure we have the exact height of the full line containing PT. */ | 5589 | /* Be sure we have the exact height of the full line containing PT. */ |
| 5590 | move_it_by_lines (&it, 0, 1); | 5590 | move_it_by_lines (&it, 0); |
| 5591 | 5591 | ||
| 5592 | /* The amount of pixels we have to move back is the window | 5592 | /* The amount of pixels we have to move back is the window |
| 5593 | height minus what's displayed in the line containing PT, | 5593 | height minus what's displayed in the line containing PT, |
| 5594 | and the lines below. */ | 5594 | and the lines below. */ |
| 5595 | it.current_y = 0; | 5595 | it.current_y = 0; |
| 5596 | it.vpos = 0; | 5596 | it.vpos = 0; |
| 5597 | move_it_by_lines (&it, nlines, 1); | 5597 | move_it_by_lines (&it, nlines); |
| 5598 | 5598 | ||
| 5599 | if (it.vpos == nlines) | 5599 | if (it.vpos == nlines) |
| 5600 | h -= it.current_y; | 5600 | h -= it.current_y; |
| @@ -5633,7 +5633,7 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5633 | */ | 5633 | */ |
| 5634 | h += extra_line_spacing; | 5634 | h += extra_line_spacing; |
| 5635 | while (-it.current_y > h) | 5635 | while (-it.current_y > h) |
| 5636 | move_it_by_lines (&it, 1, 1); | 5636 | move_it_by_lines (&it, 1); |
| 5637 | 5637 | ||
| 5638 | charpos = IT_CHARPOS (it); | 5638 | charpos = IT_CHARPOS (it); |
| 5639 | bytepos = IT_BYTEPOS (it); | 5639 | bytepos = IT_BYTEPOS (it); |