1 files changed, 13 insertions, 1 deletions

diff --git a/src/xfns.c b/src/xfns.c
index da8ed3826dc..562c366458b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1095,7 +1095,7 @@ x_set_icon_type (f, arg, oldval)
   if (result)
     {
       UNBLOCK_INPUT;
-      error ("No icon window available.");
+      error ("No icon window available");
     }
 
   /* If the window was unmapped (and its icon was mapped),
@@ -1110,6 +1110,18 @@ x_set_icon_type (f, arg, oldval)
   UNBLOCK_INPUT;
 }
 
+/* Return 1 if frame F wants a bitmap icon.  */
+
+int
+x_icon_type (f)
+     FRAME_PTR f;
+{
+  Lisp_Object tem;
+
+  tem = assq_no_quit (Qicon_type, f->param_alist);
+  return (CONSP (tem) && ! NILP (XCONS (tem)->cdr));
+}
+
 extern Lisp_Object x_new_font ();
 
 void