[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/pgtk 9fe9933: Merge remote-tracking branch 'origin/master' into
From: |
Po Lu |
Subject: |
feature/pgtk 9fe9933: Merge remote-tracking branch 'origin/master' into feature/pgtk |
Date: |
Tue, 30 Nov 2021 06:31:50 -0500 (EST) |
branch: feature/pgtk
commit 9fe993371ba696d2ec3cdfd152b433ffbee79565
Merge: fe5baf0 f633116
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge remote-tracking branch 'origin/master' into feature/pgtk
---
lisp/pixel-scroll.el | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index 1af2921..2fd7cac 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -477,18 +477,19 @@ wheel."
(if (and (nth 4 event)
(zerop (window-hscroll window)))
(let ((delta (round (cdr (nth 4 event)))))
- (if (> (abs delta) (window-text-height window t))
- (mwheel-scroll event nil)
- (with-selected-window window
- (condition-case nil
- (if (< delta 0)
- (pixel-scroll-precision-scroll-down (- delta))
- (pixel-scroll-precision-scroll-up delta))
- ;; Do not ding at buffer limits. Show a message instead.
- (beginning-of-buffer
- (message (error-message-string '(beginning-of-buffer))))
- (end-of-buffer
- (message (error-message-string '(end-of-buffer))))))))
+ (unless (zerop delta)
+ (if (> (abs delta) (window-text-height window t))
+ (mwheel-scroll event nil)
+ (with-selected-window window
+ (condition-case nil
+ (if (< delta 0)
+ (pixel-scroll-precision-scroll-down (- delta))
+ (pixel-scroll-precision-scroll-up delta))
+ ;; Do not ding at buffer limits. Show a message instead.
+ (beginning-of-buffer
+ (message (error-message-string '(beginning-of-buffer))))
+ (end-of-buffer
+ (message (error-message-string '(end-of-buffer)))))))))
(mwheel-scroll event nil))))
;;;###autoload