* startup.el (command-line-x-option-alist): Removed options -i,

-itype, --icon-type, added -nb, --no-bitmap-icon

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60649e23978c2803c8dd6767a19b4746fc84e77f..eb4a0f046c51e2437342d9754d129cf00a8adcb9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-09  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * startup.el (command-line-x-option-alist): Removed options -i, 
+       -itype, --icon-type, added -nb, --no-bitmap-icon
+
 2005-10-09  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gud.el (gud-speedbar-menu-items): Use :visible

diff --git a/lisp/startup.el b/lisp/startup.el
index 450159b36f25209a2fbfd28dddc374078499006d..3315e7236fb9795f89c53b8d25dac20636a0d7ec 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -121,8 +121,7 @@ This is normally copied from `default-directory' when Emacs starts.")
     ("-bg" 1 x-handle-switch background-color)
     ("-background" 1 x-handle-switch background-color)
     ("-ms" 1 x-handle-switch mouse-color)
-    ("-itype" 0 x-handle-switch icon-type t)
-    ("-i" 0 x-handle-switch icon-type t)
+    ("-nb" 0 x-handle-switch icon-type nil)
     ("-iconic" 0 x-handle-iconic)
     ("-xrm" 1 x-handle-xrm-switch)
     ("-cr" 1 x-handle-switch cursor-color)
@@ -143,7 +142,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)
-    ("--icon-type" 0 x-handle-switch icon-type t)
+    ("--no-bitmap-icon" 0 x-handle-switch icon-type nil)
     ("--iconic" 0 x-handle-iconic)
     ("--xrm" 1 x-handle-xrm-switch)
     ("--cursor-color" 1 x-handle-switch cursor-color)