diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-15 05:03:21 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-15 05:03:21 +0000 |
| commit | 63655c83146b773b4ef3d9220b4a9d61545fd050 (patch) | |
| tree | 2161d262bba2c99b0db2ed8b322eddcafeadd247 /lisp/cus-start.el | |
| parent | ce8f7ca45fabe11ce32a9ced2b8e7c1987c0d997 (diff) | |
| parent | b2529d56b5126319a1659dc1530d6fc102cc21d6 (diff) | |
| download | emacs-63655c83146b773b4ef3d9220b4a9d61545fd050.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 887-889)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 53245d902ae..c6b0f269d1b 100644 --- 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)) |