Merge from emacs--devo--0

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 53245d902ae11cab21516f5f5a657885b268eaf5..c6b0f269d1bb6ba526276c17c0a2099884c11f6e 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -436,7 +436,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))
-                      (eq window-system 'mac))
+                      (featurep 'mac-carbon))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
                       (featurep 'gtk))
                      ((string-match "\\`x-" (symbol-name symbol))