diff options
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index 3487552bbf7..9a442b6289f 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3519,8 +3519,21 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type) 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) |