From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 9 Sep 2005 16:22:11 +0000 (+0000)
Subject: (all): Don't complain about fringe-related
X-Git-Tag: emacs-pretest-22.0.90~7197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6eb33acbd4aac33844962f710917fdf0bb1bab02;p=emacs.git

(all): Don't complain about fringe-related
built-ins if fringes are not supported.  Ditto about
selection-related built-ins.  Fix the test for GTK-related
built-ins.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 078d278064f..fd85c39f3a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2005-09-09  Eli Zaretskii  <eliz@gnu.org>
 
+	* cus-start.el (all): Don't complain about fringe-related
+	built-ins if fringes are not supported.  Ditto about
+	selection-related built-ins.  Fix the test for GTK-related
+	built-ins.
+
 	* menu-bar.el ("Split Window", "Postscript Print Buffer (B+W)")
 	("Postscript Print Buffer", "Print Region", "Save As...")
 	("Save", "Insert File...", "Open Directory...")
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2f3cd5d0e07..c09e3152376 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -366,9 +366,15 @@ since it could result in memory overflow and make Emacs crash."
 		      ((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 (display-graphic-p)
+				(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!