From: "Juanma Barranquero" <lekktu@gmail.com>
To: "Eli Zaretskii" <eliz@gnu.org>
Cc: matsuan@ca2.so-net.ne.jp, emacs-devel@gnu.org,
Jason Rumney <jasonr@gnu.org>
Subject: Re: Emacs pretest 22.1.91
Date: Thu, 28 Feb 2008 01:48:20 +0100 [thread overview]
Message-ID: <f7ccd24b0802271648nc3df295x6a3205b24d9fae59@mail.gmail.com> (raw)
In-Reply-To: <uir0aky6t.fsf@gnu.org>
On Wed, Feb 27, 2008 at 8:15 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> Since Windows doesn't support multi-tty (and probably won't for an
> observable future), how about if Juanma makes this change conditioned
> so that it only has effect on Windows?
This is easy; see the attached patch (though I'm afraid the yuckiness
detector of Stefan is in danger of overloading).
However, this does not fix the other bug I reported: uses of
`tool-bar-map' in .emacs (or packages loaded from it) could still
cause trouble.
Juanma
2008-02-28 Juanma Barranquero <lekktu@gmail.com>
* faces.el (x-create-frame-with-faces): Don't call
`tool-bar-setup' if the frame's window-system is w32.
* frame.el (frame-notice-user-settings): Call `tool-bar-setup'.
Index: lisp/faces.el
===================================================================
RCS file: /cvsroot/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 28 Feb 2008 00:34:52 -0000
@@ -1999,8 +1999,10 @@
(frame-set-background-mode frame)
(face-set-after-frame-default frame)
- ;; 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)
+ (unless (eq (window-system frame) 'w32)
+ ;; Make sure the tool-bar is ready to be enabled. The
+ ;; `tool-bar-lines' frame parameter will not take effect
+ ;; without this call. On Windows, delay the setup to allow
+ ;; users to choose image libraries in their .emacs.
+ (tool-bar-setup frame))
(if (null visibility-spec)
(make-frame-visible frame)
Index: lisp/frame.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/frame.el,v
retrieving revision 1.269
diff -u -2 -r1.269 frame.el
--- lisp/frame.el 14 Feb 2008 21:16:36 -0000 1.269
+++ lisp/frame.el 28 Feb 2008 00:36:42 -0000
@@ -285,5 +285,9 @@
(setq default-frame-alist
(cons (cons 'tool-bar-lines (if tool-bar-mode 1 0))
- default-frame-alist))))))
+ default-frame-alist))))
+ ;; If the tool-bar was not set up before the init files, do it now.
+ ;; FIXME: When, if ever, we support multi-tty on Windows, this will
+ ;; have to be revisited.
+ (tool-bar-setup)))
;; Creating and deleting frames may shift the selected frame around,
next prev parent reply other threads:[~2008-02-28 0:48 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-19 18:50 Emacs pretest 22.1.91 Chong Yidong
2008-02-19 23:59 ` Jason Rumney
2008-02-21 6:35 ` Takashi Hiromatsu
2008-02-22 16:17 ` Eli Zaretskii
2008-02-23 3:51 ` Takashi Hiromatsu
2008-02-23 15:29 ` Eli Zaretskii
2008-02-24 14:21 ` Jason Rumney
2008-02-25 1:16 ` Takashi Hiromatsu
2008-02-25 1:27 ` Juanma Barranquero
2008-02-25 1:57 ` Takashi Hiromatsu
2008-02-25 2:13 ` Juanma Barranquero
2008-02-25 2:45 ` Takashi Hiromatsu
2008-02-25 2:44 ` Takashi Hiromatsu
2008-02-25 9:43 ` Juanma Barranquero
2008-02-25 6:16 ` Takashi Hiromatsu
2008-02-25 9:54 ` Juanma Barranquero
2008-02-25 10:58 ` Juanma Barranquero
2008-02-25 11:28 ` Jason Rumney
2008-02-25 11:42 ` Juanma Barranquero
2008-02-25 20:07 ` Eli Zaretskii
2008-02-26 1:19 ` Juanma Barranquero
2008-02-26 4:16 ` Eli Zaretskii
2008-02-26 9:36 ` Juanma Barranquero
2008-02-26 19:50 ` Eli Zaretskii
2008-02-27 1:20 ` Juanma Barranquero
2008-02-27 1:56 ` Juanma Barranquero
2008-02-27 4:14 ` Eli Zaretskii
2008-02-27 12:25 ` Juanma Barranquero
2008-02-27 12:41 ` Jason Rumney
2008-02-27 14:11 ` Juanma Barranquero
2008-02-27 15:49 ` Juanma Barranquero
2008-02-27 15:50 ` Stefan Monnier
2008-02-27 15:54 ` Juanma Barranquero
2008-02-28 1:03 ` Stefan Monnier
2008-02-28 4:14 ` Eli Zaretskii
2008-02-28 4:59 ` Stefan Monnier
2008-02-29 11:03 ` Eli Zaretskii
2008-03-02 5:15 ` Stefan Monnier
2008-02-27 19:15 ` Eli Zaretskii
2008-02-28 0:48 ` Juanma Barranquero [this message]
2008-02-25 23:45 ` Takashi Hiromatsu
2008-02-26 1:23 ` Juanma Barranquero
2008-02-26 4:09 ` Takashi Hiromatsu
2008-02-25 1:46 ` Jason Rumney
2008-02-22 19:28 ` Claus
2008-02-22 20:08 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f7ccd24b0802271648nc3df295x6a3205b24d9fae59@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jasonr@gnu.org \
--cc=matsuan@ca2.so-net.ne.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).