2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42f2354889a..b13f1b48c4c 100644
--- 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 269a90972c0..e9bc6b05fd1 100644
--- 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)))