diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
| commit | 094c7f5e487d843e7a01053234fa38d2410a3c06 (patch) | |
| tree | 6edec2eb16745059d3b57054525a2533a741c0c8 /lisp/cus-start.el | |
| parent | 13f0affc77ff56a4e4ec962ba4c92ccbf39b33a0 (diff) | |
| parent | 6a7189971f336259dcd1c9bde7797f26445dc5d9 (diff) | |
| download | emacs-merge-multi-tty-to-trunk.tar.gz | |
Merge multi-tty branchmerge-multi-tty-to-trunk
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index b83f26fc12f..e2cb65c82c4 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -422,14 +422,10 @@ since it could result in memory overflow and make Emacs crash." (eq system-type 'ms-dos)) ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) - ((string-match "\\`mac-" (symbol-name symbol)) - (eq window-system 'mac)) + ((string-match "\\`mac-" (symbol-name symbol)) + (or (eq system-type 'mac) (eq system-type 'darwin))) ((string-match "\\`x-.*gtk" (symbol-name symbol)) - (or (boundp 'gtk) - (and window-system - (not (eq window-system 'pc)) - (not (eq window-system 'mac)) - (not (eq system-type 'windows-nt))))) + (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) ((string-match "selection" (symbol-name symbol)) |