Merge remote-tracking branch 'origin/master' into feature/pgtk

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."
     (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