Mercurial > emacs
diff lisp/cus-start.el @ 90227:10fe5fadaf89
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 532-541)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 112-115)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 11 Sep 2005 22:21:01 +0000 |
| parents | 2d92f5c9d6ae 4b9f048f9a7e |
| children | 5e2d3828e89f |
line wrap: on
line diff
--- a/lisp/cus-start.el Tue Sep 06 07:30:14 2005 +0000 +++ b/lisp/cus-start.el Sun Sep 11 22:21:01 2005 +0000 @@ -369,9 +369,16 @@ ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) - (or (boundp 'gtk) (not (eq system-type 'windows-nt)))) + (or (boundp 'gtk) + (and window-system + (not (eq window-system 'pc)) + (not (eq system-type 'windows-nt))))) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) + ((string-match "selection" (symbol-name symbol)) + (fboundp 'x-selection-exists-p)) + ((string-match "fringe" (symbol-name symbol)) + (fboundp 'define-fringe-bitmap)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here!