(command-line-x-option-alist): Use x-handle-no-bitmap-icon.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5275d798a83a7871f49ff098a54f83a59d9e99ae..a30aa13f0736017719d0ea7bedd09f950406f8ca 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  Ralf Angeli  <angeli@caeruleus.net>
 
        * textmodes/reftex.el (reftex-access-parse-file): Create parse

diff --git a/lisp/startup.el b/lisp/startup.el
index f57bf66a3a01286ccc5923f5aab53a8f1a7e98f1..37336d45e29a7c42f7b470ebcc9ac0c54dea89ff 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -144,7 +144,7 @@ This is normally copied from `default-directory' when Emacs starts.")
     ("--foreground-color" 1 x-handle-switch foreground-color)
     ("--background-color" 1 x-handle-switch background-color)
     ("--mouse-color" 1 x-handle-switch mouse-color)
-    ("--no-bitmap-icon" 0 x-handle-switch icon-type nil)
+    ("--no-bitmap-icon" 0 x-handle-no-bitmap-icon)
     ("--iconic" 0 x-handle-iconic)
     ("--xrm" 1 x-handle-xrm-switch)
     ("--cursor-color" 1 x-handle-switch cursor-color)