summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-10-04 01:23:30 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-10-04 01:23:30 +0000
commitbf784417de59427b321d2fd20f1e777bd731d7bd (patch)
tree90f68ef3b173ca8f035947afb488ab616d051143 /lisp/faces.el
parent847fb889ab9d0f22b772056e02aa658427027a87 (diff)
downloademacs-bf784417de59427b321d2fd20f1e777bd731d7bd.tar.gz
(x-create-frame-with-faces): Only setup the toolbar if
tool-bar-mode is on.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el3
1 files changed, 2 insertions, 1 deletions
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)))