# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1149301962 0
# Node ID 18dfea3e32033f5d64caf51a801a1bb44e254f4f
# Parent  ed68e074ebb4de7b4dfcdd693130cd7ea3822832
(x_set_icon_name): Apply 2006-06-02 change for xfns.c.

diff -r ed68e074ebb4 -r 18dfea3e3203 src/macfns.c
--- a/src/macfns.c	Sat Jun 03 02:31:51 2006 +0000
+++ b/src/macfns.c	Sat Jun 03 02:32:42 2006 +0000
@@ -1592,7 +1592,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;