Commit 56f41f98 authored by Chong Yidong's avatar Chong Yidong

* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a

	string.
parent 3d80c941
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
......
......@@ -1249,7 +1249,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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment