comparison src/w32fns.c @ 90428:a8190f7e546e

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author Miles Bader <miles@gnu.org>
date Wed, 07 Jun 2006 18:05:10 +0000
parents 2ecafc6d5db7 9fcdaa132bf3
children 138ce2701550
comparison
equal deleted inserted replaced
90427:ddb25860d044 90428:a8190f7e546e
1682 if (STRINGP (arg)) 1682 if (STRINGP (arg))
1683 { 1683 {
1684 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) 1684 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
1685 return; 1685 return;
1686 } 1686 }
1687 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) 1687 else if (!NILP (arg) || NILP (oldval))
1688 return; 1688 return;
1689 1689
1690 f->icon_name = arg; 1690 f->icon_name = arg;
1691 1691
1692 #if 0 1692 #if 0