diff options
| author | Tak Kunihiro <tkk@misasa.okayama-u.ac.jp> | 2021-01-09 11:21:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-01-09 11:21:04 +0200 |
| commit | 32a3758c84a6031b118fbcce91606d307a93cc14 (patch) | |
| tree | 2c66b62f4cb321c73dd16df0b8d96337965f4c59 | |
| parent | 74d18957b898e687dcc07ba86559367c8d8ba482 (diff) | |
| download | emacs-32a3758c84a6031b118fbcce91606d307a93cc14.tar.gz | |
Fix infloop in 'pixel-scroll-mode'
* lisp/pixel-scroll.el (pixel-scroll-up, pixel-scroll-down): Avoid
inflooping when 'vertical-motion' doesn't move. (Bug#45628)
| -rw-r--r-- | lisp/pixel-scroll.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 8e6e049d246..f722c25b751 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -133,8 +133,10 @@ This is an alternative of `scroll-up'. Scope moves downward." (pixel-line-height)))) (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 + (catch 'no-movement + (while (pixel-point-at-top-p amt) ; prevent too late (multi tries) + (unless (>= (vertical-motion 1) 1) ; move point downward + (throw 'no-movement nil)))) ; exit loop when point did not move (pixel-scroll-pixel-up amt)))))) ; move scope downward (defun pixel-scroll-down (&optional arg) @@ -150,8 +152,10 @@ This is and alternative of `scroll-down'. Scope moves upward." pixel-resolution-fine-flag (frame-char-height)) (pixel-line-height -1)))) - (while (pixel-point-at-bottom-p amt) ; prevent too late (multi tries) - (vertical-motion -1)) ; move point upward + (catch 'no-movement + (while (pixel-point-at-bottom-p amt) ; prevent too late (multi tries) + (unless (<= (vertical-motion -1) -1) ; move point upward + (throw 'no-movement nil)))) ; exit loop when point did not move (if (or (pixel-bob-at-top-p amt) ; when beginning-of-the-buffer is seen (pixel-eob-at-top-p)) ; for file with a long line (scroll-down 1) ; relay on robust method |