Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/emacs.c b/src/emacs.c
index a4416354c12..0149bec6d5e 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, -nbi          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\
@@ -1836,8 +1836,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 },
+  { "-nbi", "--no-bitmap-icon", 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
   { "-D", "--basic-display", 12, 0},
   { "-basic-display", 0, 12, 0},