Close bug#3992.

[gnu-emacs] / lisp / scroll-bar.el

diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index f12e0b42b9459ae9fd8100724c00c789c6f5e2ca..3f763fc59dad2e2d12e2a66bbdbffdde5fc99044 100644 (file)
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -1,7 +1,7 @@
 ;;; scroll-bar.el --- window system-independent scroll bar support
 
 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
 ;;; scroll-bar.el --- window system-independent scroll bar support
 
 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,

-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

 
 ;; Maintainer: FSF
 ;; Keywords: hardware
 
 ;; Maintainer: FSF
 ;; Keywords: hardware


@@ -94,7 +94,7 @@ This is nil while loading `scroll-bar.el', and t afterward.")
                                              scroll-bar-mode)))))
 
 (defcustom scroll-bar-mode default-frame-scroll-bars
                                              scroll-bar-mode)))))
 
 (defcustom scroll-bar-mode default-frame-scroll-bars

-  "*Specify whether to have vertical scroll bars, and on which side.
+  "Specify whether to have vertical scroll bars, and on which side.

 Possible values are nil (no scroll bars), `left' (scroll bars on left)
 and `right' (scroll bars on right).
 To set this variable in a Lisp program, use `set-scroll-bar-mode'
 Possible values are nil (no scroll bars), `left' (scroll bars on left)
 and `right' (scroll bars on right).
 To set this variable in a Lisp program, use `set-scroll-bar-mode'


@@ -117,15 +117,15 @@ Setting the variable with a customization buffer also takes effect."
   "Toggle display of vertical scroll bars on all frames.
 This command applies to all frames that exist and frames to be
 created in the future.
   "Toggle display of vertical scroll bars on all frames.
 This command applies to all frames that exist and frames to be
 created in the future.

-With a numeric argument, if the argument is negative,
-turn off scroll bars; otherwise, turn on scroll bars."
+With a numeric argument, if the argument is positive
+turn on scroll bars; otherwise turn off scroll bars."

   (interactive "P")
 
   ;; Tweedle the variable according to the argument.
   (interactive "P")
 
   ;; Tweedle the variable according to the argument.

-  (set-scroll-bar-mode (if (if (null flag) 
+  (set-scroll-bar-mode (if (if (null flag)

                               (not scroll-bar-mode)
                             (setq flag (prefix-numeric-value flag))
                               (not scroll-bar-mode)
                             (setq flag (prefix-numeric-value flag))

-                            (or (not (numberp flag)) (>= flag 0)))
+                            (or (not (numberp flag)) (> flag 0)))

                           (or previous-scroll-bar-mode
                               default-frame-scroll-bars))))
 
                           (or previous-scroll-bar-mode
                               default-frame-scroll-bars))))
 


@@ -156,7 +156,7 @@ Horizontal scroll bars aren't implemented yet."
 \f
 ;;;; Buffer navigation using the scroll bar.
 
 \f
 ;;;; Buffer navigation using the scroll bar.
 

-;;; This was used for up-events on button 2, but no longer.
+;; This was used for up-events on button 2, but no longer.

 (defun scroll-bar-set-window-start (event)
   "Set the window start according to where the scroll bar is dragged.
 EVENT should be a scroll bar click or drag event."
 (defun scroll-bar-set-window-start (event)
   "Set the window start according to where the scroll bar is dragged.
 EVENT should be a scroll bar click or drag event."


@@ -164,8 +164,7 @@ EVENT should be a scroll bar click or drag event."
   (let* ((end-position (event-end event))
         (window (nth 0 end-position))
         (portion-whole (nth 2 end-position)))
   (let* ((end-position (event-end event))
         (window (nth 0 end-position))
         (portion-whole (nth 2 end-position)))

-    (save-excursion
-      (set-buffer (window-buffer window))
+    (with-current-buffer (window-buffer window)

       (save-excursion
        (goto-char (+ (point-min)
                      (scroll-bar-scale portion-whole
       (save-excursion
        (goto-char (+ (point-min)
                      (scroll-bar-scale portion-whole


@@ -195,8 +194,7 @@ EVENT should be a scroll bar click or drag event."
         portion-start
         next-portion-start
         (current-start (window-start window)))
         portion-start
         next-portion-start
         (current-start (window-start window)))

-    (save-excursion
-      (set-buffer (window-buffer window))
+    (with-current-buffer (window-buffer window)

       (setq portion-start (scroll-bar-drag-position portion-whole))
       (setq next-portion-start (max
                                (scroll-bar-drag-position next-portion-whole)
       (setq portion-start (scroll-bar-drag-position portion-whole))
       (setq next-portion-start (max
                                (scroll-bar-drag-position next-portion-whole)


@@ -212,14 +210,14 @@ EVENT should be a scroll bar click or drag event."
   (let* ((start-position (event-start event))
         (window (nth 0 start-position))
         (portion-whole (nth 2 start-position)))
   (let* ((start-position (event-start event))
         (window (nth 0 start-position))
         (portion-whole (nth 2 start-position)))

-    (save-excursion
-      (set-buffer (window-buffer window))
-      ;; Calculate position relative to the accessible part of the buffer.
-      (goto-char (+ (point-min)
-                   (scroll-bar-scale portion-whole
-                                     (- (point-max) (point-min)))))
-      (vertical-motion 0 window)
-      (set-window-start window (point)))))
+    (save-excursion 
+      (with-current-buffer (window-buffer window)
+       ;; Calculate position relative to the accessible part of the buffer.
+       (goto-char (+ (point-min)
+                     (scroll-bar-scale portion-whole
+                                       (- (point-max) (point-min)))))
+       (vertical-motion 0 window)
+       (set-window-start window (point))))))

 
 (defun scroll-bar-drag (event)
   "Scroll the window by dragging the scroll bar slider.
 
 (defun scroll-bar-drag (event)
   "Scroll the window by dragging the scroll bar slider.


@@ -339,7 +337,7 @@ EVENT should be a scroll bar click."
 \f
 ;;;; Bindings.
 
 \f
 ;;;; Bindings.
 

-;;; For now, we'll set things up to work like xterm.
+;; For now, we'll set things up to work like xterm.

 (cond ((and (boundp 'x-toolkit-scroll-bars) x-toolkit-scroll-bars)
        (global-set-key [vertical-scroll-bar mouse-1]
                       'scroll-bar-toolkit-scroll))
 (cond ((and (boundp 'x-toolkit-scroll-bars) x-toolkit-scroll-bars)
        (global-set-key [vertical-scroll-bar mouse-1]
                       'scroll-bar-toolkit-scroll))