(x_set_name_internal): Set icon to `text', derived from name, when

[gnu-emacs] / src / xfns.c

diff --git a/src/xfns.c b/src/xfns.c
index 5d580c9a1f12a3d07df935c3dddfd3ae16e98a71..e6772dc65d9a54179803eaa66097a8d880b3d100 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -788,12 +788,9 @@ xg_set_icon (f, file)
     FRAME_PTR f;
     Lisp_Object file;
 {
-  struct gcpro gcpro1;
   int result = 0;
   Lisp_Object found;
 
-  GCPRO1 (found);
-
   found = x_find_image_file (file);
 
   if (! NILP (found))
@@ -819,7 +816,6 @@ xg_set_icon (f, file)
       UNBLOCK_INPUT;
     }
 
-  UNGCPRO;
   return result;
 }
 
@@ -1253,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;
@@ -1630,7 +1626,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;
          }