summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTak Kunihiro <tkk@misasa.okayama-u.ac.jp>2017-12-23 11:16:40 +0200
committerEli Zaretskii <eliz@gnu.org>2017-12-23 11:16:40 +0200
commit9105c9aa3438773cf68cf40615b55db81d1e9480 (patch)
tree587044b95b76baeb216bd124ccdf2fe191587384
parentb882d4ef11b4d12cc16face4a0e80818045a2aa3 (diff)
downloademacs-9105c9aa3438773cf68cf40615b55db81d1e9480.tar.gz
Fix scrolling up in pixel-scroll.el
* lisp/pixel-scroll.el (pixel-scroll-up): Do not try to move cursor down when EOB is shown at the top. This function is reverted to commit 1bda71ec3b11eeb4d06c3da094a3cb21bac18d5c. (bug#29737)
-rw-r--r--lisp/pixel-scroll.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index f64a4392b49..70244873b4b 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -110,11 +110,11 @@ This is an alternative of `scroll-up'. Scope moves downward."
pixel-resolution-fine-flag
(frame-char-height))
(pixel-line-height))))
- (while (pixel-point-at-top-p amt) ; prevent too late (multi tries)
- (vertical-motion 1)) ; move point downward
- (if (pixel-eob-at-top-p) ; when end-of-the-buffer is close
- (scroll-up 1) ; relay on robust method
- (pixel-scroll-pixel-up amt))))) ; move scope downward
+ (if (pixel-eob-at-top-p) ; when end-of-the-buffer is close
+ (scroll-up 1) ; relay on robust method
+ (while (pixel-point-at-top-p amt) ; prevent too late (multi tries)
+ (vertical-motion 1)) ; move point downward
+ (pixel-scroll-pixel-up amt))))) ; move scope downward
(defun pixel-scroll-down (&optional arg)
"Scroll text of selected window down ARG lines.