From 56f41f98c0536b58e5f2bfeb8e0675d64796125b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 2 Jun 2006 16:35:59 +0000 Subject: [PATCH] * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a string. --- src/ChangeLog | 5 +++++ src/xfns.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index dccebac3ec5..06144ce5498 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Chong Yidong + + * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a + string. + 2006-06-02 YAMAMOTO Mitsuharu * xdisp.c (next_element_from_composition): Set it->object to diff --git a/src/xfns.c b/src/xfns.c index 396ef8ceb64..9b9ba48ba82 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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; -- 2.39.5