From: Eli Zaretskii Date: Mon, 13 Jun 2005 11:54:48 +0000 (+0000) Subject: (all): Don't complain about missing GTK-related variables, X-Git-Tag: emacs-pretest-22.0.90~9006 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2702394e7cc558300e8ba74d0b3882f6f1897cc7;p=emacs.git (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 f9ec346596c..80a86d8afbd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-06-13 Eli Zaretskii + + * 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 * woman.el (woman-mode-line-format): Delete constant. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 36bebf68871..db14975a480 100644 --- 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))))