Re: Emacs pretest 22.1.91

[Juanma Barranquero]

On Wed, Feb 27, 2008 at 8:15 PM, Eli Zaretskii <address@hidden> 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  <address@hidden>

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