From: Jan Djärv Date: Sun, 9 Oct 2005 06:58:13 +0000 (+0000) Subject: * startup.el (command-line-x-option-alist): Removed options -i, X-Git-Tag: emacs-pretest-22.0.90~6733 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c1db08afc2ee71671e6b8f7d60a197fbcc60469;p=emacs.git * 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 60649e23978..eb4a0f046c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-09 Jan Dj,Ad(Brv + + * startup.el (command-line-x-option-alist): Removed options -i, + -itype, --icon-type, added -nb, --no-bitmap-icon + 2005-10-09 Nick Roberts * progmodes/gud.el (gud-speedbar-menu-items): Use :visible diff --git a/lisp/startup.el b/lisp/startup.el index 450159b36f2..3315e7236fb 100644 --- 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)