Mercurial > emacs
changeset 68395:00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 26 Jan 2006 17:48:52 +0000 |
| parents | 0b6d0aad4517 |
| children | 75dead191600 |
| files | src/frame.c |
| diffstat | 1 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Thu Jan 26 06:43:33 2006 +0000 +++ b/src/frame.c Thu Jan 26 17:48:52 2006 +0000 @@ -3519,8 +3519,21 @@ register Lisp_Object tem; tem = Fassq (param, alist); - if (EQ (tem, Qnil)) + + if (!NILP (tem)) + { + /* If we find this parm in ALIST, clear it out + so that it won't be "left over" at the end. */ +#ifdef HAVE_X_WINDOWS /* macfns.c and w32fns.c have not yet + been changed to cope with this. */ + XSETCAR (tem, Qnil); +#endif + } + else tem = Fassq (param, Vdefault_frame_alist); + + /* If it wasn't specified in ALIST or the Lisp-level defaults, + look in the X resources. */ if (EQ (tem, Qnil)) { if (attribute)