aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2003-01-01 17:00:34 +0000
committerRichard M. Stallman2003-01-01 17:00:34 +0000
commit96ae58c8acaecb6907897a4c928cba4f4eee3e58 (patch)
tree7a2f4514d7ec86b536ba81bfe2a6fee36c0088aa
parent2764bebdf12634d7af165463cd8e6024bdf5de8e (diff)
downloademacs-96ae58c8acaecb6907897a4c928cba4f4eee3e58.tar.gz
emacs-96ae58c8acaecb6907897a4c928cba4f4eee3e58.zip
(window_scroll_pixel_based): Partially undo last change.
-rw-r--r--src/window.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index 3f115260adf..83440f440cc 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4147,9 +4147,11 @@ window_scroll_pixel_based (window, n, whole, noerror)
4147 else 4147 else
4148 move_it_by_lines (&it, n, 1); 4148 move_it_by_lines (&it, n, 1);
4149 4149
4150 /* End if we end up at ZV or BEGV. */ 4150 /* We failed if we find ZV is already on the screen (scrolling up,
4151 means there's nothing past the end), or if we can't start any
4152 earlier (scrolling down, means there's nothing past the top). */
4151 if ((n > 0 && IT_CHARPOS (it) == ZV) 4153 if ((n > 0 && IT_CHARPOS (it) == ZV)
4152 || (n < 0 && IT_CHARPOS (it) == BEGV)) 4154 || (n < 0 && IT_CHARPOS (it) == CHARPOS (start)))
4153 { 4155 {
4154 if (IT_CHARPOS (it) == ZV) 4156 if (IT_CHARPOS (it) == ZV)
4155 { 4157 {