(scroll-bar-scroll-down, scroll-bar-scroll-up):

Set point-before-scroll at end even if there was an error.

diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 5458ab0054f1e1868832075ecdc5200528ec02ca..d8e21921458b0fc3f2c3bcd0597f363860958624 100644 (file)
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -250,16 +250,17 @@ EVENT should be a scroll bar click."
         (before-scroll))
     (with-current-buffer (window-buffer window)
       (setq before-scroll point-before-scroll))
-    (save-selected-window
-      (let ((portion-whole (nth 2 end-position)))
-       (select-window window)
-       (setq before-scroll
-             (or before-scroll (point)))
-       (scroll-down
-        (scroll-bar-scale portion-whole (1- (window-height))))))
-    (sit-for 0)
-    (with-current-buffer (window-buffer window)
-      (setq point-before-scroll before-scroll))))
+    (unwind-protect
+       (save-selected-window
+         (let ((portion-whole (nth 2 end-position)))
+           (select-window window)
+           (setq before-scroll
+                 (or before-scroll (point)))
+           (scroll-down
+            (scroll-bar-scale portion-whole (1- (window-height)))))
+         (sit-for 0))
+      (with-current-buffer (window-buffer window)
+       (setq point-before-scroll before-scroll)))))
 
 (defun scroll-bar-scroll-up (event)
   "Scroll the line next to the scroll bar click to the top of the window.
@@ -270,16 +271,17 @@ EVENT should be a scroll bar click."
         (before-scroll))
     (with-current-buffer (window-buffer window)
       (setq before-scroll point-before-scroll))
-    (save-selected-window
-      (let ((portion-whole (nth 2 end-position)))
-       (select-window window)
-       (setq before-scroll
-             (or before-scroll (point)))
-       (scroll-up
-        (scroll-bar-scale portion-whole (1- (window-height))))))
-    (sit-for 0)
-    (with-current-buffer (window-buffer window)
-      (setq point-before-scroll before-scroll))))
+    (unwind-protect
+       (save-selected-window
+         (let ((portion-whole (nth 2 end-position)))
+           (select-window window)
+           (setq before-scroll
+                 (or before-scroll (point)))
+           (scroll-up
+            (scroll-bar-scale portion-whole (1- (window-height)))))
+         (sit-for 0))
+      (with-current-buffer (window-buffer window)
+       (setq point-before-scroll before-scroll)))))
 
 \f
 ;;;; Bindings.