diff options
| author | Chong Yidong <[email protected]> | 2011-09-18 16:01:37 -0400 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2011-09-18 16:01:37 -0400 |
| commit | 33ed493bca4647ab949193104d7e49c95c095bc8 (patch) | |
| tree | a959d36bd8cd59d9220bc49bbdfb266fb5650c8b /doc/lispref/frames.texi | |
| parent | 72753f87ca435108ba039078dfa0c833aefb453c (diff) | |
Fix handling of X resource for window icons.
* src/xfns.c (Fx_create_frame): Handle bitmapIcon resource as a boolean.
* doc/emacs/cmdargs.texi (Icons X): Fix description of Emacs icon.
* doc/emacs/xresources.texi (Table of Resources): Fix documentation of
bitmapIcon.
* doc/lispref/frames.texi (Management Parameters): Fix description of
icon-type parameter.
Fixes: debbugs:9154
Diffstat (limited to 'doc/lispref/frames.texi')
| -rw-r--r-- | doc/lispref/frames.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index e799cfa6b7..d619b92e4d 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -779,10 +779,10 @@ Whether deselecting the frame lowers it (non-@code{nil} means yes). @vindex icon-type, a frame parameter @item icon-type -The type of icon to use for this frame when it is iconified. If the -value is a string, that specifies a file containing a bitmap to use. -Any other non-@code{nil} value specifies the default bitmap icon (a -picture of a gnu); @code{nil} specifies a text icon. +The type of icon to use for this frame. If the value is a string, +that specifies a file containing a bitmap to use; @code{nil} specifies +no icon (in which case the window manager decides what to show); any +other non-@code{nil} value specifies the default Emacs icon. @vindex icon-name, a frame parameter @item icon-name |