diff options
Diffstat (limited to 'lisp/pixel-scroll.el')
| -rw-r--r-- | lisp/pixel-scroll.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 1af292139ea..2fd7cace0b0 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el | |||
| @@ -477,18 +477,19 @@ wheel." | |||
| 477 | (if (and (nth 4 event) | 477 | (if (and (nth 4 event) |
| 478 | (zerop (window-hscroll window))) | 478 | (zerop (window-hscroll window))) |
| 479 | (let ((delta (round (cdr (nth 4 event))))) | 479 | (let ((delta (round (cdr (nth 4 event))))) |
| 480 | (if (> (abs delta) (window-text-height window t)) | 480 | (unless (zerop delta) |
| 481 | (mwheel-scroll event nil) | 481 | (if (> (abs delta) (window-text-height window t)) |
| 482 | (with-selected-window window | 482 | (mwheel-scroll event nil) |
| 483 | (condition-case nil | 483 | (with-selected-window window |
| 484 | (if (< delta 0) | 484 | (condition-case nil |
| 485 | (pixel-scroll-precision-scroll-down (- delta)) | 485 | (if (< delta 0) |
| 486 | (pixel-scroll-precision-scroll-up delta)) | 486 | (pixel-scroll-precision-scroll-down (- delta)) |
| 487 | ;; Do not ding at buffer limits. Show a message instead. | 487 | (pixel-scroll-precision-scroll-up delta)) |
| 488 | (beginning-of-buffer | 488 | ;; Do not ding at buffer limits. Show a message instead. |
| 489 | (message (error-message-string '(beginning-of-buffer)))) | 489 | (beginning-of-buffer |
| 490 | (end-of-buffer | 490 | (message (error-message-string '(beginning-of-buffer)))) |
| 491 | (message (error-message-string '(end-of-buffer)))))))) | 491 | (end-of-buffer |
| 492 | (message (error-message-string '(end-of-buffer))))))))) | ||
| 492 | (mwheel-scroll event nil)))) | 493 | (mwheel-scroll event nil)))) |
| 493 | 494 | ||
| 494 | ;;;###autoload | 495 | ;;;###autoload |