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

        scroll bars correctly default to being on the right for Mac
        Carbon port by testing "mac-carbon" feature, not window-system.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 522fa2fe9ec..f39518c7bf3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-02  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 by testing "mac-carbon" feature, not window-system.
+
 2003-01-02  Markus Rost  <rost@math.ohio-state.edu>
 
         * cus-edit.el (customize-group, customize-group-other-window): 
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 0c27e17510c..74fd948ee68 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -89,7 +89,7 @@ This is nil while loading `scroll-bar.el', and t afterward.")
 
 (defcustom scroll-bar-mode
   (cond ((eq system-type 'windows-nt) 'right)
-        ((eq window-system 'mac) '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)
@@ -123,7 +123,7 @@ turn off scroll bars; otherwise, turn on scroll bars."
   (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)
-                                    ((eq window-system 'mac) 'right)
+                                    ((featurep 'mac-carbon) 'right)
                                     (t 'left))))))
 
 (defun toggle-scroll-bar (arg)
@@ -144,7 +144,7 @@ when they are turned on; if it is nil, they go on the left."
                (if (> arg 0)
                    (or scroll-bar-mode
                        (cond ((eq system-type 'windows-nt) 'right)
-                             ((eq window-system 'mac) 'right)
+                             ((featurep 'mac-carbon) 'right)
                              (t 'left))))))))
 
 (defun toggle-horizontal-scroll-bar (arg)