[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: address@hidden: crash setting frame parameter icon-name to non-nil n
From: |
Chong Yidong |
Subject: |
Re: address@hidden: crash setting frame parameter icon-name to non-nil non-string value] |
Date: |
Fri, 02 Jun 2006 12:35:32 -0400 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
> From: address@hidden (John Paul Wallington)
> Subject: crash setting frame parameter icon-name to non-nil non-string value
>
> M-: (set-frame-parameter nil 'icon-name 'crashme)
> C-x 5 2
>
> crash
>
> I'm not sure whether the following is a good fix so I didn't install it:
>
> 2006-05-29 John Paul Wallington <address@hidden>
>
> * xfns.c (x_set_name_internal): Use `text' when `icon-name' isn't
> a string rather than only when it is nil.
>
> - --- xfns.c 27 May 2006 22:23:05 +0100 1.665
> +++ xfns.c 29 May 2006 02:17:05 +0100
> @@ -1626,7 +1626,7 @@
> text.format = 8;
> text.nitems = bytes;
>
> - - if (NILP (f->icon_name))
> + if (!STRINGP (f->icon_name))
> {
> icon = text;
> }
I checked in another fix (patch below). Probably macfns.c and
w32fns.c need to be fixed too.
*** emacs/src/xfns.c.~1.665.~ 2006-04-17 18:12:24.000000000 -0400
--- emacs/src/xfns.c 2006-06-02 12:30:51.000000000 -0400
***************
*** 1249,1255 ****
if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
return;
}
! else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
return;
f->icon_name = arg;
--- 1249,1255 ----
if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
return;
}
! else if (!NILP (arg) || NILP (oldval))
return;
f->icon_name = arg;
- Re: address@hidden: crash setting frame parameter icon-name to non-nil non-string value],
Chong Yidong <=