(all): Don't complain about missing GTK-related variables,

unless either `gtk' is boundp or this isn't a `windows-nt' build.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9ec346596c66dfd1c506597efc83390cd2c7a02..80a86d8afbd13d3af730bab27ace7f293c30861d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * cus-start.el (all): Don't complain about missing GTK-related
+       variables, unless either `gtk' is boundp or this isn't a
+       `windows-nt' build.
+
 2005-06-13  Lute Kamstra  <lute@gnu.org>
 
        * woman.el (woman-mode-line-format): Delete constant.

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 36bebf6887109acb00a1916bef6dc5e9f94e8341..db14975a480ec90cd9e59a23b8c78d3e69bcf1e0 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -322,6 +322,8 @@ 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 "\\`x-.*gtk" (symbol-name symbol))
+                      (or (boundp 'gtk) (not (eq system-type 'windows-nt))))
                      ((string-match "\\`x-" (symbol-name symbol))
                       (fboundp 'x-create-frame))
                      (t t))))