diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2005-06-13 11:54:48 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2005-06-13 11:54:48 +0000 |
| commit | 2702394e7cc558300e8ba74d0b3882f6f1897cc7 (patch) | |
| tree | 2dc436206264866680cb92c78850f699a50937f7 | |
| parent | cb6ccbc94ba6387d2e94ef4ddb56912f01969744 (diff) | |
| download | emacs-2702394e7cc558300e8ba74d0b3882f6f1897cc7.tar.gz emacs-2702394e7cc558300e8ba74d0b3882f6f1897cc7.tar.bz2 emacs-2702394e7cc558300e8ba74d0b3882f6f1897cc7.zip | |
(all): Don't complain about missing GTK-related variables,
unless either `gtk' is boundp or this isn't a `windows-nt' build.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/cus-start.el | 2 |
2 files changed, 8 insertions, 0 deletions
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 <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 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)))) |