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

7 files changed, 26 insertions, 10 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d87493d57b3..163eabed2a6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* cmdargs.texi (Icons X): Fix description of Emacs icon.
+
+	* xresources.texi (Table of Resources): Fix documentation of
+	bitmapIcon.
+
 2011-09-15  Chong Yidong  <cyd@stupidchicken.com>
 
 	* package.texi (Package Menu): Add package-menu-mark-upgrades.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 2a19e1b009d..07cca53ce4d 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1107,7 +1107,7 @@ Start Emacs in an iconified (``minimized'') state.
 @itemx --no-bitmap-icon
 @opindex --no-bitmap-icon
 @cindex Emacs icon, a gnu
-Do not use a picture of a gnu as the Emacs icon.
+Do not display the Emacs icon.
 @end table
 
   Most window managers allow you to ``iconify'' (or ``minimize'') an
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index d30f7e42254..c2e65268d1b 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -169,11 +169,10 @@ with the class that it belongs to:
 @item @code{background} (class @code{Background})
 Background color name.
 
-@ifnottex
 @item @code{bitmapIcon} (class @code{BitmapIcon})
-Use a bitmap icon (a picture of a gnu) if @samp{on}, let the window
-manager choose an icon if @samp{off}.
-@end ifnottex
+Tell the window manager to display the Emacs icon if @samp{on}; don't
+do so if @samp{off}.  (The icon is usually shown in the ``taskbar'' on
+a graphical desktop.)
 
 @item @code{borderColor} (class @code{BorderColor})
 Color name for the external border.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 24108cc6a46..3d3038cba35 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frames.texi (Management Parameters): Fix description of
+	icon-type parameter.
+
 2011-09-17  Chong Yidong  <cyd@stupidchicken.com>
 
 	* tips.texi (Key Binding Conventions): Don't bind a key sequence
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e799cfa6b7f..d619b92e4d3 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
diff --git a/src/ChangeLog b/src/ChangeLog
index 1e110cc5139..8c223cc374e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xfns.c (Fx_create_frame): Handle the bitmapIcon resource as
+	boolean (Bug#9154).
+
 2011-09-18  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (display_line): Record maximum and minimum buffer
diff --git a/src/xfns.c b/src/xfns.c
index 998c803a7ad..913cde75d91 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3369,7 +3369,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   /* We need to do this after creating the X window, so that the
      icon-creation functions can say whose icon they're describing.  */
   x_default_parameter (f, parms, Qicon_type, Qt,
-		       "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL);
+		       "bitmapIcon", "BitmapIcon", RES_TYPE_BOOLEAN);
 
   x_default_parameter (f, parms, Qauto_raise, Qnil,
 		       "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN);