From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 2 Jun 2006 21:21:55 +0000 (+0000)
Subject: (x_set_icon_name): Don't use arg if it's not a string and not nil.
X-Git-Tag: emacs-pretest-22.0.90~2110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f65d6f5206a47fd677036a73d8d1a0920454d05;p=emacs.git

(x_set_icon_name): Don't use arg if it's not a string and not nil.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 386ec5670d4..0b352232cb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32fns.c (x_set_icon_name): Don't use arg if it's not a string
+	and not nil.
+
 2006-06-02  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
diff --git a/src/w32fns.c b/src/w32fns.c
index 609a88debbd..25aa22f0683 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1683,7 +1683,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;