# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1149266159 0
# Node ID 54189ea7ad2ac4c004deff95172d8418986ca335
# Parent  9e0fcc4e1d6402a19100616bc8397efae25ae9cf
	* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
	string.

diff -r 9e0fcc4e1d64 -r 54189ea7ad2a src/ChangeLog
--- a/src/ChangeLog	Fri Jun 02 10:13:43 2006 +0000
+++ b/src/ChangeLog	Fri Jun 02 16:35:59 2006 +0000
@@ -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 -r 9e0fcc4e1d64 -r 54189ea7ad2a src/xfns.c
--- a/src/xfns.c	Fri Jun 02 10:13:43 2006 +0000
+++ b/src/xfns.c	Fri Jun 02 16:35:59 2006 +0000
@@ -1249,7 +1249,7 @@
       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;