From: Jan Djärv Date: Sun, 9 Oct 2005 06:59:21 +0000 (+0000) Subject: * cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type, X-Git-Tag: emacs-pretest-22.0.90~6732 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ea7445208845c9d54557754dfdeafdd2c05b653;p=emacs.git * cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type, added -nb, --no-bitmap-icon. --- diff --git a/man/ChangeLog b/man/ChangeLog index f4e10d85e11..a4040eb5a53 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2005-10-09 Jan Dj,Ad(Brv + + * cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type, + added -nb, --no-bitmap-icon. + 2005-10-08 Michael Albinus Sync with Tramp 2.0.51. diff --git a/man/cmdargs.texi b/man/cmdargs.texi index dad7e61dbf2..d0ab8788150 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi @@ -1173,12 +1173,12 @@ If you have many clients running at once, you can avoid cluttering up the screen by iconifying most of the clients. @table @samp -@item -i -@opindex -i -@itemx --icon-type -@opindex --icon-type +@item -nb +@opindex -nb +@itemx --no-bitmap-icon +@opindex --no-bitmap-icon @cindex Emacs icon, a gnu -Use a picture of a gnu as the Emacs icon. +Do not use a picture of a gnu as the Emacs icon. @item -iconic @opindex --iconic @@ -1187,8 +1187,8 @@ Use a picture of a gnu as the Emacs icon. Start Emacs in iconified state. @end table - The @samp{-i} or @samp{--icon-type} option tells Emacs to use an icon -window containing a picture of the GNU gnu. If omitted, Emacs lets the + By default Emacs uses an icon window containing a picture of the GNU gnu. +The @samp{-np} or @samp{--no-bitmap-icon} option tells Emacs to let the window manager choose what sort of icon to use---usually just a small rectangle containing the frame's title.