From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 26 Jan 2006 17:48:52 +0000 (+0000)
Subject: (x_get_arg): "Clear out" the parm in ALIST if found there.
X-Git-Tag: emacs-pretest-22.0.90~4575
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d00368cf268ab3e020f6e85121781ff069068057;p=emacs.git

(x_get_arg): "Clear out" the parm in ALIST if found there.
---

diff --git a/src/frame.c b/src/frame.c
index 9060f7b47c5..630961d0b41 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)