From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 13 Oct 2007 09:14:27 +0000 (+0000)
Subject: * cus-start.el (all): Undo previous change.
X-Git-Tag: emacs-pretest-23.0.90~10364
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d2062d8f6e43761a1175f1b9f779b827012722a;p=emacs.git

* cus-start.el (all): Undo previous change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9849391e35e..fd9fe354579 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* cus-start.el (all): Undo previous change.
+
 2007-10-13  Glenn Morris  <rgm@gnu.org>
 
 	* woman.el (woman0-rename): Fix paren typo.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c5d50549c5e..179fd6b183e 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))
-		       (eq window-system 'mac))
+ 		       (or (eq system-type 'mac) (eq system-type 'darwin)))
 		      ((string-match "\\`x-.*gtk" (symbol-name symbol))
 		       (featurep 'gtk))
 		      ((string-match "\\`x-" (symbol-name symbol))