From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 22 Jul 2007 12:13:34 +0000 (+0000)
Subject: (x-handle-no-bitmap-icon): New function.
X-Git-Tag: emacs-pretest-23.0.90~11801
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0389072b378cf15d0e7991146b3a3594dad8e9b5;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3548af3cc9c..e5dc4b6f90c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-22  Jan Dj,Ad(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 4e80589ad43..efe6275c8f7 100644
--- 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