# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1064100817 0
# Node ID 3fb606ea8bf60e1531b9d7b5e45b5a221fc90ea3
# Parent  4a93216e6678cafb388a296889d93d0a8a0b211b
(set-scroll-bar-mode): Initialize to new built-in variable
default-frame-scroll-bars.
(scroll-bar-mode): Use default-frame-scroll-bars when enabling
scroll-bar-mode; notably, use it instead of t when we toggle
scroll-bars on.
(toggle-scroll-bar): Use default-frame-scroll-bars.

diff -r 4a93216e6678 -r 3fb606ea8bf6 lisp/scroll-bar.el
--- a/lisp/scroll-bar.el	Sat Sep 20 23:26:20 2003 +0000
+++ b/lisp/scroll-bar.el	Sat Sep 20 23:33:37 2003 +0000
@@ -87,10 +87,7 @@
 	 (list (cons 'vertical-scroll-bars scroll-bar-mode)))
 	(setq frames (cdr frames))))))
 
-(defcustom scroll-bar-mode
-  (cond ((eq system-type 'windows-nt) 'right)
-	((featurep 'mac-carbon) 'right)
-	(t 'left))
+(defcustom scroll-bar-mode default-frame-scroll-bars
   "*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).
@@ -117,14 +114,13 @@
 With a numeric argument, if the argument is negative,
 turn off scroll bars; otherwise, turn on scroll bars."
   (interactive "P")
-  (if flag (setq flag (prefix-numeric-value flag)))
 
   ;; Tweedle the variable according to the argument.
-  (set-scroll-bar-mode (if (null flag) (not scroll-bar-mode)
-			 (and (or (not (numberp flag)) (>= flag 0))
-			      (cond ((eq system-type 'windows-nt) 'right)
-				    ((featurep 'mac-carbon) 'right)
-				    (t 'left))))))
+  (set-scroll-bar-mode (if (if (null flag) 
+			       (not scroll-bar-mode)
+			     (setq flag (prefix-numeric-value flag))
+			     (or (not (numberp flag)) (>= flag 0)))
+			   default-frame-scroll-bars)))
 
 (defun toggle-scroll-bar (arg)
   "Toggle whether or not the selected frame has vertical scroll bars.
@@ -142,10 +138,7 @@
    (selected-frame)
    (list (cons 'vertical-scroll-bars
 	       (if (> arg 0)
-		   (or scroll-bar-mode
-		       (cond ((eq system-type 'windows-nt) 'right)
-			     ((featurep 'mac-carbon) 'right)
-			     (t 'left))))))))
+		   (or scroll-bar-mode default-frame-scroll-bars))))))
 
 (defun toggle-horizontal-scroll-bar (arg)
   "Toggle whether or not the selected frame has horizontal scroll bars.