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

2 files changed, 6 insertions, 1 deletions

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);