diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-05-07 16:52:25 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-05-07 16:52:25 +0300 |
| commit | c0162ade6f6f1300bdf087627f7d19afa480f1fc (patch) | |
| tree | d1432a6097a2cf671e4771ef0ef0d5e9d4f96eaf /lisp/cus-start.el | |
| parent | d16bdfc3a1e288643e340848d260bac6443cf445 (diff) | |
| download | emacs-c0162ade6f6f1300bdf087627f7d19afa480f1fc.tar.gz | |
cus-start.el (all): Add native condition for tool-bar-* symbols.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 07f7702e9d6..bc48aa88cc5 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -408,6 +408,10 @@ since it could result in memory overflow and make Emacs crash." (fboundp 'define-fringe-bitmap)) ((equal "font-use-system-font" (symbol-name symbol)) (featurep 'system-font-setting)) + ;; Conditioned on x-create-frame, because that's + ;; the condition for loadup.el to preload tool-bar.el. + ((string-match "tool-bar-" (symbol-name symbol)) + (fboundp 'x-create-frame)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here! |