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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd796c99f4aefbfead0e2b8fc26ee0a44c30ae8d..9865fd4f0c6ce53c320e4a1b567527a3738e726f 100644 (file)
--- 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 179fd6b183ebcda6f5a6cc00b20fb846d67decc3..c5d50549c5e50e447e8a087f219f6785d1eeba52 100644 (file)
--- 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))