Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-294
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-295
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-296
   Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * emacs@sv.gnu.org/emacs--devo--0--patch-297
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-298
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-299
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-300
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-301
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-302
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-303
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-304
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-103
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-104
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570

1 files changed, 2 insertions, 2 deletions

diff --git a/src/xfns.c b/src/xfns.c
index acbf22b600c..11552a5a9f7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1260,7 +1260,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;
@@ -1635,7 +1635,7 @@ x_set_name_internal (f, name)
         text.format = 8;
         text.nitems = bytes;
 
-        if (NILP (f->icon_name))
+        if (!STRINGP (f->icon_name))
           {
             icon = text;
           }