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

[Po Lu]

branch: feature/pgtk
commit fe5baf0a101fc880ef253a302d584f240cde51b7
Merge: 4beecd8 4e2fa4c
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 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index 888320c..1af2921 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -480,9 +480,15 @@ wheel."
           (if (> (abs delta) (window-text-height window t))
               (mwheel-scroll event nil)
             (with-selected-window window
-              (if (< delta 0)
-                 (pixel-scroll-precision-scroll-down (- delta))
-                (pixel-scroll-precision-scroll-up delta)))))
+              (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