]> code.delx.au - gnu-emacs/commitdiff
(x_set_icon_name): Apply 2006-06-02 change for xfns.c.
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Sat, 3 Jun 2006 02:32:42 +0000 (02:32 +0000)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Sat, 3 Jun 2006 02:32:42 +0000 (02:32 +0000)
src/macfns.c

index 1f2c2d39f47e169aad0b6e771ab100c2582baa10..752a6a6991ccae171dd8a93a39f68a1511c80d6d 100644 (file)
@@ -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;