From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 2 Jun 2006 16:35:59 +0000 (+0000)
Subject: * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
X-Git-Tag: emacs-pretest-22.0.90~2115
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56f41f98c0536b58e5f2bfeb8e0675d64796125b;p=emacs.git

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

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  <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
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;