* scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have

	scroll bars correctly default to being on the right for Mac
	Carbon port

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d260198a24e057f1680fac7ab6f6e6104135e88..3a8f261f70b13e1ae8c127cefb2357d4de48fd53 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-30  Steven Tamm  <steventamm@mac.com>
+
+       * scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have
+       scroll bars correctly default to being on the right for Mac
+       Carbon port 
+       
 2002-12-29  Nick Roberts  <nick@nick.uklinux.net>
 
        * gdb-ui.el (gdb-delete-display): Rename (gdb-delete-expression).

diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 7230ca046a08fdedac46b04cc24e7e676ee43f43..0c27e17510cc47d69e3898ef3a3a9b1acfd7027a 100644 (file)
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -88,7 +88,9 @@ This is nil while loading `scroll-bar.el', and t afterward.")
        (setq frames (cdr frames))))))
 
 (defcustom scroll-bar-mode
-  (if (eq system-type 'windows-nt) 'right 'left)
+  (cond ((eq system-type 'windows-nt) 'right)
+       ((eq window-system 'mac) '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).
@@ -120,7 +122,9 @@ turn off scroll bars; otherwise, turn on scroll bars."
   ;; 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))
-                             (if (eq system-type 'windows-nt) 'right 'left)))))
+                             (cond ((eq system-type 'windows-nt) 'right)
+                                   ((eq window-system 'mac) 'right)
+                                   (t 'left))))))
 
 (defun toggle-scroll-bar (arg)
   "Toggle whether or not the selected frame has vertical scroll bars.
@@ -139,7 +143,9 @@ when they are turned on; if it is nil, they go on the left."
    (list (cons 'vertical-scroll-bars
               (if (> arg 0)
                   (or scroll-bar-mode
-                      (if (eq system-type 'windows-nt) 'right 'left)))))))
+                      (cond ((eq system-type 'windows-nt) 'right)
+                            ((eq window-system 'mac) 'right)
+                            (t 'left))))))))
 
 (defun toggle-horizontal-scroll-bar (arg)
   "Toggle whether or not the selected frame has horizontal scroll bars.