(set-scroll-bar-mode): Take just one arg.

(set-scroll-bar-mode-1): Take 2 args, as set-scroll-bar-mode used to.
(scroll-bar-mode variable): Use set-scroll-bar-mode-1.
(scroll-bar-mode command): Pass 1 arg to set-scroll-bar-mode.

diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index ccdf34909c77ed076c3a3fc0c754fc35fd56be4c..f94fc6754af4826576a1ca5be5457ebe3f75d4ca 100644 (file)
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -62,7 +62,10 @@ that scroll bar position."
   "Non-nil means `set-scroll-bar-mode' should really do something.
 This is nil while loading `scroll-bar.el', and t afterward.")
 
-(defun set-scroll-bar-mode (ignore value)
+(defun set-scroll-bar-mode-1 (ignore value)
+  (set-scroll-bar-mode value))
+
+(defun set-scroll-bar-mode (value)
   "Set `scroll-bar-mode' to VALUE and put the new value into effect."
   (setq scroll-bar-mode value)
 
@@ -95,7 +98,7 @@ it takes effect immediately for all frames."
                 (const left)
                 (const right))
   :group 'frames
-  :set 'set-scroll-bar-mode)
+  :set 'set-scroll-bar-mode-1)
 
 ;; We just set scroll-bar-mode, but that was the default.
 ;; If it is set again, that is for real.
@@ -111,8 +114,7 @@ turn off scroll bars; otherwise, turn on scroll bars."
   (if flag (setq flag (prefix-numeric-value flag)))
 
   ;; Tweedle the variable according to the argument.
-  (set-scroll-bar-mode nil
-                      (if (null flag) (not scroll-bar-mode)
+  (set-scroll-bar-mode (if (null flag) (not scroll-bar-mode)
                         (and (or (not (numberp flag)) (>= flag 0))
                              'left))))