Mercurial > emacs
changeset 71166:54189ea7ad2a
* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
string.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 02 Jun 2006 16:35:59 +0000 |
| parents | 9e0fcc4e1d64 |
| children | d61af0a1f66d |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jun 02 10:13:43 2006 +0000 +++ b/src/ChangeLog Fri Jun 02 16:35:59 2006 +0000 @@ -1,3 +1,8 @@ +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
--- a/src/xfns.c Fri Jun 02 10:13:43 2006 +0000 +++ b/src/xfns.c Fri Jun 02 16:35:59 2006 +0000 @@ -1249,7 +1249,7 @@ 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;