Mercurial > emacs
comparison src/macfns.c @ 71176:18dfea3e3203
(x_set_icon_name): Apply 2006-06-02 change for xfns.c.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Sat, 03 Jun 2006 02:32:42 +0000 |
parents | 30ac4bc8f8f7 |
children | 1f25049753ba 46b1096093f5 a8190f7e546e |
comparison
equal
deleted
inserted
replaced
71175:ed68e074ebb4 | 71176:18dfea3e3203 |
---|---|
1590 if (STRINGP (arg)) | 1590 if (STRINGP (arg)) |
1591 { | 1591 { |
1592 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) | 1592 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) |
1593 return; | 1593 return; |
1594 } | 1594 } |
1595 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) | 1595 else if (!NILP (arg) || NILP (oldval)) |
1596 return; | 1596 return; |
1597 | 1597 |
1598 f->icon_name = arg; | 1598 f->icon_name = arg; |
1599 | 1599 |
1600 #if 0 /* MAC_TODO */ | 1600 #if 0 /* MAC_TODO */ |