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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df7d21c6124f1f8516d94bde6ef6915d1162cca3..1bced3edfdfab849e3cbaa169f03724c04e21d3c 100644 (file)
--- 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 07f7702e9d62fb5a036fbb5a73a19950da061ed9..bc48aa88cc5d4393f2f96a813d34f0a269d8406d 100644 (file)
--- 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!