diff options
| author | YAMAMOTO Mitsuharu | 2006-06-03 02:32:42 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2006-06-03 02:32:42 +0000 |
| commit | a05e867db70e729774f9cd27822f6b80184d7930 (patch) | |
| tree | 2abe838e43e93fd5815d00883ee638a8efb2fa84 /src | |
| parent | dc34c597e44738705941b4caf44afad3cfdad9a9 (diff) | |
| download | emacs-a05e867db70e729774f9cd27822f6b80184d7930.tar.gz emacs-a05e867db70e729774f9cd27822f6b80184d7930.zip | |
(x_set_icon_name): Apply 2006-06-02 change for xfns.c.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macfns.c b/src/macfns.c index 1f2c2d39f47..752a6a6991c 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -1592,7 +1592,7 @@ x_set_icon_name (f, arg, oldval) | |||
| 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; |