-nb changed to -nbi

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3cafdb3e471233495ee749a5a9aacf789671f03f..d5bc0f4abb0d14de7e4d4b91db3b1b76af2cb732 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-10  Jan Dj\e,Ad\e(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 --git a/etc/NEWS b/etc/NEWS
index b32e2b83fdc2add613963832ecfca6372ef7a1e2..3debb1648663173390876c5201acc82bb5cb3ab8 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -177,7 +177,7 @@ disables the splash screen; see also the variable
 
 +++
 ** 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 --git a/man/ChangeLog b/man/ChangeLog
index 3b92927513684e588c3b2fef4bfc7ca4b96b6cbb..c4e793ac00fd0158d13aa1a72e7731b4ec63d144 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-10  Jan Dj\e,Ad\e(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 --git a/man/cmdargs.texi b/man/cmdargs.texi
index d0ab8788150f9b86c6e93a64e57b4c8f6178afd2..bdb57d9b0635b380996d2a8eb4d4a452bf84f16d 100644 (file)
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1173,8 +1173,8 @@ If you have many clients running at once, you can avoid cluttering up
 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 --git a/src/ChangeLog b/src/ChangeLog
index d9e64625393549a2d58255615d4f055db1f841d1..dada003404af42a542366608be8bc2cb841e2749 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-10  Jan Dj\e,Ad\e(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 --git a/src/emacs.c b/src/emacs.c
index 497cdd7943f671441fd7fd4b869d58f702a316d1..4eee9e0e53429148132abaf80fc5fd3a5f2963d5 100644 (file)
--- 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\
---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 @@ struct standard_args standard_args[] =
   { "-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},