From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 13 Oct 2007 16:36:05 +0000 (+0000)
Subject: * cus-start.el (all): Use test that does not match the X11 version
X-Git-Tag: emacs-pretest-23.0.90~10353
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce00d093379eb0b90ff68c803c657a7677857f76;p=emacs.git

* cus-start.el (all): Use test that does not match the X11 version
for mac.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dfae3c8d3b..bd4f1bbb748 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* cus-start.el (all): Use test that does not match the X11 version
+	for mac.
+
 2007-10-13  Markus Gritsch  <m.gritsch@gmail.com>  (tiny change)
 
 	* progmodes/ebrowse.el (ebrowse-tree-mode): Disable undo in the
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 179fd6b183e..6a66d8caa75 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)))
+ 		       (featurep 'mac-carbon))
 		      ((string-match "\\`x-.*gtk" (symbol-name symbol))
 		       (featurep 'gtk))
 		      ((string-match "\\`x-" (symbol-name symbol))