diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2005-09-09 16:22:11 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2005-09-09 16:22:11 +0000 |
| commit | 6eb33acbd4aac33844962f710917fdf0bb1bab02 (patch) | |
| tree | 033032d37b9ab53c26aa4ca19263a17fc229fcfb /lisp/cus-start.el | |
| parent | 50a6ff152de5886d6a671597e8648dab57ec3080 (diff) | |
| download | emacs-6eb33acbd4aac33844962f710917fdf0bb1bab02.tar.gz | |
(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.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 8 |
1 files changed, 7 insertions, 1 deletions
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! |