# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1223271851 0
# Node ID 604d7c98ac1acb6e6d55751db2de9f167275e704
# Parent  69b1ca445635d9ad5aae5c1a76aff12e4d037e14
(x-create-frame-with-faces): Undo previous change.

diff -r 69b1ca445635 -r 604d7c98ac1a lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 06 05:30:25 2008 +0000
+++ b/lisp/ChangeLog	Mon Oct 06 05:44:11 2008 +0000
@@ -1,5 +1,7 @@
 2008-10-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* faces.el (x-create-frame-with-faces): Undo previous change.
+
 	* vc-cvs.el (vc-cvs-after-dir-status): Parse the output for non
 	existent files.
 
diff -r 69b1ca445635 -r 604d7c98ac1a lisp/faces.el
--- a/lisp/faces.el	Mon Oct 06 05:30:25 2008 +0000
+++ b/lisp/faces.el	Mon Oct 06 05:44:11 2008 +0000
@@ -2007,8 +2007,7 @@
 	  ;; Make sure the tool-bar is ready to be enabled.  The
 	  ;; `tool-bar-lines' frame parameter will not take effect
 	  ;; without this call.
-	  (when tool-bar-mode
-	    (tool-bar-setup frame))
+	  (tool-bar-setup frame)
 	  (if (null visibility-spec)
 	      (make-frame-visible frame)
 	    (modify-frame-parameters frame (list visibility-spec)))