* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a

	string.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dccebac3ec5..06144ce5498 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
+        string.
+
 2006-06-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * xdisp.c (next_element_from_composition): Set it->object to
diff --git a/src/xfns.c b/src/xfns.c
index 396ef8ceb64..9b9ba48ba82 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1249,7 +1249,7 @@ x_set_icon_name (f, arg, oldval)
       if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
         return;
     }
-  else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
+  else if (!NILP (arg) || NILP (oldval))
     return;
 
   f->icon_name = arg;