[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Emacs pretest 22.1.91

From: Juanma Barranquero
Subject: Re: Emacs pretest 22.1.91
Date: Wed, 27 Feb 2008 15:11:15 +0100

On Wed, Feb 27, 2008 at 1:41 PM, Jason Rumney <address@hidden> 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.

>  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?


2008-02-27  Juanma Barranquero  <address@hidden>

        * 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)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]