diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-13 05:53:03 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-13 05:53:03 +0000 |
| commit | 2b42d458a45eaf9767da327f76a40a1cf9c77c23 (patch) | |
| tree | f896828e65199d043ea7ab366fffea8bd315a986 /lisp/cus-start.el | |
| parent | 3e88ae627ef8d827b3f79e4e6f14aaad7adfe322 (diff) | |
| parent | e2cfa9afa691fb8b7a554cb685c16ff3d4e1ff2b (diff) | |
| download | emacs-2b42d458a45eaf9767da327f76a40a1cf9c77c23.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 880-885)
- Remove RCS keywords from doc/misc/cc-mode.texi
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264
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 ee6491a1a79..53245d902ae 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)) - (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)) |