diff lisp/cus-start.el @ 83364:46dfd959d88a

Merged in changes from CVS trunk. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-404
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 09 Sep 2005 20:52:13 +0000
parents 4b9f048f9a7e
children b3ed9c9b7a4f 5a8e49e5b281 10fe5fadaf89
line wrap: on
line diff
--- a/lisp/cus-start.el	Fri Sep 09 19:04:34 2005 +0000
+++ b/lisp/cus-start.el	Fri Sep 09 20:52:13 2005 +0000
@@ -366,9 +366,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!