summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/faces.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a06b1120471..8e3496d2323 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/faces.el b/lisp/faces.el
index e9bc6b05fd1..269a90972c0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2007,8 +2007,7 @@ 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.
- (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)))