From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 12 Oct 2008 13:45:58 +0000 (+0000)
Subject: (x-create-frame-with-faces): Don't call tool-bar-setup.
X-Git-Tag: emacs-pretest-23.0.90~2525
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1461986d175cced4c180752aaaa56d1b466da3e;p=emacs.git

(x-create-frame-with-faces): Don't call tool-bar-setup.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 269a90972c0..4e4b926f4fd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1977,7 +1977,6 @@ Value is the new parameter list."
 
 (declare-function x-create-frame "xfns.c" (parms))
 (declare-function x-setup-function-keys "term/x-win" (frame))
-(declare-function tool-bar-setup "tool-bar" (&optional frame))
 
 (defun x-create-frame-with-faces (&optional parameters)
   "Create a frame from optional frame parameters PARAMETERS.
@@ -2004,10 +2003,6 @@ Value is the new frame created."
 	  (x-handle-reverse-video frame parameters)
 	  (frame-set-background-mode frame)
 	  (face-set-after-frame-default frame parameters)
-	  ;; 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)
 	  (if (null visibility-spec)
 	      (make-frame-visible frame)
 	    (modify-frame-parameters frame (list visibility-spec)))