diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /src/w32fns.c | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
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
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 4da5271c870..aa83e006194 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -1684,7 +1684,7 @@ x_set_icon_name (f, arg, oldval) | |||
| 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; |