diff options
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | man/ChangeLog | 4 | ||||
| -rw-r--r-- | man/cmdargs.texi | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 4 |
6 files changed, 17 insertions, 5 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 3cafdb3e471..d5bc0f4abb0 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -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. @@ -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 3b929275136..c4e793ac00f 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -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 --git a/man/cmdargs.texi b/man/cmdargs.texi index d0ab8788150..bdb57d9b063 100644 --- 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 d9e64625393..dada003404a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/emacs.c b/src/emacs.c index 497cdd7943f..4eee9e0e534 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\ ---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}, |