* cus-start.el (all): Use the same test as the 22.2 branch.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd796c99f4a..9865fd4f0c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * cus-start.el (all): Use the same test as the 22.2 branch.
+
 2007-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * diff-mode.el (diff-current-defun): Force recomputation of
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 179fd6b183e..c5d50549c5e 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -433,7 +433,7 @@ since it could result in memory overflow and make Emacs crash."
                       ((string-match "\\`w32-" (symbol-name symbol))
                        (eq system-type 'windows-nt))
                       ((string-match "\\`mac-" (symbol-name symbol))
-                       (or (eq system-type 'mac) (eq system-type 'darwin)))
+                       (eq window-system 'mac))
                       ((string-match "\\`x-.*gtk" (symbol-name symbol))
                        (featurep 'gtk))
                       ((string-match "\\`x-" (symbol-name symbol))