diff options
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 730c83e647f..15f314d75e7 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -412,14 +412,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)) |