summaryrefslogtreecommitdiff
path: root/src/xfns.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c
index acbf22b600c..11552a5a9f7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1260,7 +1260,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;
@@ -1635,7 +1635,7 @@ x_set_name_internal (f, name)
text.format = 8;
text.nitems = bytes;
- if (NILP (f->icon_name))
+ if (!STRINGP (f->icon_name))
{
icon = text;
}