cus-start.el (all): Add native condition for tool-bar-* symbols.

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df7d21c6124..1bced3edfdf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Add native condition for tool-bar-* symbols.
+
 2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
 
         * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
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!