# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1128960840 0
# Node ID 3733ed3530eca2c942870b7211ad5bc4b270adb4
# Parent  6d475e9c028992819d58c2ba935bd19a6c0a957f
-nb changed to -nbi

diff -r 6d475e9c0289 -r 3733ed3530ec etc/ChangeLog
--- a/etc/ChangeLog	Mon Oct 10 15:00:57 2005 +0000
+++ b/etc/ChangeLog	Mon Oct 10 16:14:00 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* NEWS: -nb => -nbi
+
 2005-10-10  Carsten Dominik  <dominik@science.uva.nl>
 
 	* orgcard.tex: Version 3.17, no changes except version number.
diff -r 6d475e9c0289 -r 3733ed3530ec etc/NEWS
--- a/etc/NEWS	Mon Oct 10 15:00:57 2005 +0000
+++ b/etc/NEWS	Mon Oct 10 16:14:00 2005 +0000
@@ -177,7 +177,7 @@
 
 +++
 ** The default is now to use an bitmap as the icon, so the command-line options
---icon-type, -i has been replaced with options --no-bitmap-icon, -nb to turn
+--icon-type, -i has been replaced with options --no-bitmap-icon, -nbi to turn
 the bitmap icon off.
 
 +++
diff -r 6d475e9c0289 -r 3733ed3530ec man/ChangeLog
--- a/man/ChangeLog	Mon Oct 10 15:00:57 2005 +0000
+++ b/man/ChangeLog	Mon Oct 10 16:14:00 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* cmdargs.texi (Icons X): -nb => -nbi
+
 2005-10-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* frames.texi (Speedbar): A couple more clarifications.
diff -r 6d475e9c0289 -r 3733ed3530ec man/cmdargs.texi
--- a/man/cmdargs.texi	Mon Oct 10 15:00:57 2005 +0000
+++ b/man/cmdargs.texi	Mon Oct 10 16:14:00 2005 +0000
@@ -1173,8 +1173,8 @@
 the screen by iconifying most of the clients.
 
 @table @samp
-@item -nb
-@opindex -nb
+@item -nbi
+@opindex -nbi
 @itemx --no-bitmap-icon
 @opindex --no-bitmap-icon
 @cindex Emacs icon, a gnu
diff -r 6d475e9c0289 -r 3733ed3530ec src/ChangeLog
--- a/src/ChangeLog	Mon Oct 10 15:00:57 2005 +0000
+++ b/src/ChangeLog	Mon Oct 10 16:14:00 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* emacs.c (USAGE3, standard_args): -nb => -nbi
+
 2005-10-10  Juanma Barranquero  <lekktu@gmail.com>
 
 	* frame.c (Fredirect_frame_focus): Fix typos in docstring.
diff -r 6d475e9c0289 -r 3733ed3530ec src/emacs.c
--- a/src/emacs.c	Mon Oct 10 15:00:57 2005 +0000
+++ b/src/emacs.c	Mon Oct 10 16:14:00 2005 +0000
@@ -311,7 +311,7 @@
 --fullscreen, -fs               make first frame fullscreen\n\
 --fullwidth, -fw                make the first frame wide as the screen\n\
 --geometry, -g GEOMETRY         window geometry\n\
---no-bitmap-icon, -nb           do not 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\
@@ -1828,7 +1828,7 @@
   { "-u", "--user", 30, 1 },
   { "-user", 0, 30, 1 },
   { "-debug-init", "--debug-init", 20, 0 },
-  { "-nb", "--no-bitmap-icon", 15, 0 },
+  { "-nbi", "--no-bitmap-icon", 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
   { "-D", "--basic-display", 12, 0},
   { "-basic-display", 0, 12, 0},