(x-handle-no-bitmap-icon): New function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3548af3cc9c47e53be1eed532568bccfecf557ca..e5dc4b6f90cc52ff9c716ab8e30c61df61cdf143 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-22  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon,
+
+       * term/x-win.el (x-handle-no-bitmap-icon): New function.
+
 2007-07-22  Martin Rudalics  <rudalics@gmx.at>
 
        * add-log.el (change-log-fill-parenthesized-list): New function.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 4e80589ad43773ea44f9922c1ad5721f09ccea6d..efe6275c8f7ef2233c35e321f9c2cbb4b1fb432e 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -129,6 +129,9 @@
                        initial-frame-alist)
                  x-invocation-args (cdr x-invocation-args)))))))
 
+(defun x-handle-no-bitmap-icon (switch)
+  (setq default-frame-alist (cons '(icon-type) default-frame-alist)))
+
 ;; Make -iconic apply only to the initial frame!
 (defun x-handle-iconic (switch)
   (setq initial-frame-alist