[Emacs-diffs] Changes to emacs/lisp/scroll-bar.el

[Kim F. Storm]

Index: emacs/lisp/scroll-bar.el
diff -c emacs/lisp/scroll-bar.el:1.47 emacs/lisp/scroll-bar.el:1.48
*** emacs/lisp/scroll-bar.el:1.47       Mon Sep  1 11:45:14 2003
--- emacs/lisp/scroll-bar.el    Sat Sep 20 19:33:37 2003
***************
*** 87,96 ****
         (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))
    "*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).
--- 87,93 ----
         (list (cons 'vertical-scroll-bars scroll-bar-mode)))
        (setq frames (cdr frames))))))
  
! (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,130 ****
  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))))))
  
  (defun toggle-scroll-bar (arg)
    "Toggle whether or not the selected frame has vertical scroll bars.
--- 114,126 ----
  With a numeric argument, if the argument is negative,
  turn off scroll bars; otherwise, turn on scroll bars."
    (interactive "P")
  
    ;; Tweedle the variable according to the argument.
!   (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,151 ****
     (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))))))))
  
  (defun toggle-horizontal-scroll-bar (arg)
    "Toggle whether or not the selected frame has horizontal scroll bars.
--- 138,144 ----
     (selected-frame)
     (list (cons 'vertical-scroll-bars
               (if (> arg 0)
!                  (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.