From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 9 Oct 2005 06:57:00 +0000 (+0000)
Subject: * emacs.c (standard_args): Removed options -i, -itype, --icon-type,
X-Git-Tag: emacs-pretest-22.0.90~6734
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55c9bfe532eb8ab382a5219963a76bf35e438095;p=emacs.git

* emacs.c (standard_args): Removed options -i, -itype, --icon-type,
added -nb, --no-bitmap-icon.
---

diff --git a/src/emacs.c b/src/emacs.c
index 80281d4f26b..497cdd7943f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -311,7 +311,7 @@ Display options:\n\
 --fullscreen, -fs               make first frame fullscreen\n\
 --fullwidth, -fw                make the first frame wide as the screen\n\
 --geometry, -g GEOMETRY         window geometry\n\
---icon-type, -i                 use picture of gnu for Emacs icon\n\
+--no-bitmap-icon, -nb           do not use picture of gnu for Emacs icon\n\
 --iconic                        start Emacs in iconified state\n\
 --internal-border, -ib WIDTH    width between text and main border\n\
 --line-spacing, -lsp PIXELS     additional space to put between lines\n\
@@ -1828,8 +1828,7 @@ struct standard_args standard_args[] =
   { "-u", "--user", 30, 1 },
   { "-user", 0, 30, 1 },
   { "-debug-init", "--debug-init", 20, 0 },
-  { "-i", "--icon-type", 15, 0 },
-  { "-itype", 0, 15, 0 },
+  { "-nb", "--no-bitmap-icon", 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
   { "-D", "--basic-display", 12, 0},
   { "-basic-display", 0, 12, 0},