From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: Emacs pretest 22.1.91 Date: Wed, 27 Feb 2008 15:11:15 +0100 Message-ID: References: <87ejb8vl0i.fsf@stupidchicken.com> <47C55A60.5010709@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1204121495 8165 80.91.229.12 (27 Feb 2008 14:11:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Feb 2008 14:11:35 +0000 (UTC) Cc: Eli Zaretskii , matsuan@ca2.so-net.ne.jp, emacs-devel@gnu.org To: "Jason Rumney" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 27 15:11:59 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JUN0k-0003Xd-WB for ged-emacs-devel@m.gmane.org; Wed, 27 Feb 2008 15:11:55 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JUN0F-0003bx-49 for ged-emacs-devel@m.gmane.org; Wed, 27 Feb 2008 09:11:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JUN0B-0003bd-78 for emacs-devel@gnu.org; Wed, 27 Feb 2008 09:11:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JUN09-0003ab-8G for emacs-devel@gnu.org; Wed, 27 Feb 2008 09:11:18 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JUN09-0003aY-1V for emacs-devel@gnu.org; Wed, 27 Feb 2008 09:11:17 -0500 Original-Received: from el-out-1112.google.com ([209.85.162.181]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JUN08-0005bX-Er for emacs-devel@gnu.org; Wed, 27 Feb 2008 09:11:16 -0500 Original-Received: by el-out-1112.google.com with SMTP id m34so2642976ele.10 for ; Wed, 27 Feb 2008 06:11:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=CaGqEdxKOFWtY+3EadBViUKGByrnOx/5quY1vltUuv0=; b=E8dtKiuy/Ce50wbrFkivlBimf2UaD51GsQ7bwbyG9npRqrTk99mZ9rll6B/I5/h3ukmtJpQrBx9SV7r7JZL6vDAEsxX7H/ylMA7ijJzEVqvIiZur91+s775ZZyxTzRTm+G3AbwTP+AXFimoHHVSx5rtqX98B6hfUlnwLXkrKBcM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=SKFDSzCz/H0rH7xP7ORI104F/OKrRP3Gz07BzAHiqWdVNxsWT3pieZ3KkwzArT6d7jdh7B4lI61mGplXoD59iLBN4nBds4SA4nMsUEfCZwr3dVFWig8cu8nse5dPpHZHS/CkP/Skqy1Rw34Hgb6bmP+Md7AVjMzYLCypIPKj+14= Original-Received: by 10.114.109.1 with SMTP id h1mr7412471wac.35.1204121475197; Wed, 27 Feb 2008 06:11:15 -0800 (PST) Original-Received: by 10.115.72.13 with HTTP; Wed, 27 Feb 2008 06:11:15 -0800 (PST) In-Reply-To: <47C55A60.5010709@gnu.org> Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 (Google crawlbot) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:90603 Archived-At: On Wed, Feb 27, 2008 at 1:41 PM, Jason Rumney wrote: > I think the case that the previous change was trying to fix is where > emacs is started as emacs -nw and a GUI frame is created later. Ah, I see. When the initial frame is a tty frame, frame-initialize does nothing (because initial-window-system is nil), so tool-bar-setup is not run, so it runs for the first non-tty frame created. > AFAICT, > frame-notice-user-settings is only called at startup, so I think moving > the tool-bar setup there will cause this case to fail again. OK, what about this simpler change then? Juanma 2008-02-27 Juanma Barranquero * faces.el (x-create-frame-with-faces): Delay call to `tool-bar-setup' if invoked before loading the init files. Index: lisp/faces.el =================================================================== RCS file: /sources/emacs/emacs/lisp/faces.el,v retrieving revision 1.394 diff -u -2 -r1.394 faces.el --- lisp/faces.el 22 Feb 2008 23:34:57 -0000 1.394 +++ lisp/faces.el 27 Feb 2008 13:01:43 -0000 @@ -2002,5 +2002,8 @@ ;; `tool-bar-lines' frame parameter will not take effect ;; without this call. - (tool-bar-setup frame) + (if after-init-time + (tool-bar-setup frame) + ;; delay until the init files have been loaded + (add-hook 'after-init-hook `(lambda () (tool-bar-setup ,frame)))) (if (null visibility-spec) (make-frame-visible frame)