Mercurial > emacs
comparison src/w32fns.c @ 71171:9fcdaa132bf3
(x_set_icon_name): Don't use arg if it's not a string and not nil.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 02 Jun 2006 21:20:44 +0000 |
parents | 589489bb1924 |
children | 26164031aa5a a8190f7e546e |
comparison
equal
deleted
inserted
replaced
71170:82731c9a92fc | 71171:9fcdaa132bf3 |
---|---|
1681 if (STRINGP (arg)) | 1681 if (STRINGP (arg)) |
1682 { | 1682 { |
1683 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) | 1683 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) |
1684 return; | 1684 return; |
1685 } | 1685 } |
1686 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) | 1686 else if (!NILP (arg) || NILP (oldval)) |
1687 return; | 1687 return; |
1688 | 1688 |
1689 f->icon_name = arg; | 1689 f->icon_name = arg; |
1690 | 1690 |
1691 #if 0 | 1691 #if 0 |