From a05e867db70e729774f9cd27822f6b80184d7930 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sat, 3 Jun 2006 02:32:42 +0000
Subject: [PATCH] (x_set_icon_name): Apply 2006-06-02 change for xfns.c.

---
 src/macfns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/macfns.c b/src/macfns.c
index 1f2c2d39f47..752a6a6991c 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1592,7 +1592,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;
-- 
2.39.5