[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/frame.c
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/frame.c |
Date: |
Thu, 26 Jan 2006 17:48:52 +0000 |
Index: emacs/src/frame.c
diff -u emacs/src/frame.c:1.323 emacs/src/frame.c:1.324
--- emacs/src/frame.c:1.323 Wed Jan 18 01:48:43 2006
+++ emacs/src/frame.c Thu Jan 26 17:48:52 2006
@@ -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)