(x-create-frame-with-faces): Only setup the toolbar if

tool-bar-mode is on.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42f2354889a9fd80f6bb1022095760b1050b1d73..b13f1b48c4cc05d4ef1c86bd4b22eddc53fe68f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * faces.el (x-create-frame-with-faces): Only setup the toolbar if
+       tool-bar-mode is on.
+
        * vc-svn.el (vc-svn-dir-status-files):
        * vc-cvs.el (vc-cvs-dir-status-files): New function.
 

diff --git a/lisp/faces.el b/lisp/faces.el
index 269a90972c031991eb2119f4330a462c4db39402..e9bc6b05fd13a8e4c16fab78f343f8ac8a70eda6 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2007,7 +2007,8 @@ Value is the new frame created."
          ;; Make sure the tool-bar is ready to be enabled.  The
          ;; `tool-bar-lines' frame parameter will not take effect
          ;; without this call.
-         (tool-bar-setup frame)
+         (when tool-bar-mode
+           (tool-bar-setup frame))
          (if (null visibility-spec)
              (make-frame-visible frame)
            (modify-frame-parameters frame (list visibility-spec)))