From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 15 Feb 2006 01:05:33 +0000 (+0000)
Subject: (x_get_arg): Clear out all occurrences of PARAM in ALIST.
X-Git-Tag: emacs-pretest-22.0.90~4121
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f69492604f7a91733972602bf1a45f5a53ab258;p=emacs.git

(x_get_arg): Clear out all occurrences of PARAM in ALIST.
---

diff --git a/src/frame.c b/src/frame.c
index 6712fa6b287..08b3764fe16 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3526,7 +3526,14 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
 	 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.  */
+      Lisp_Object tail;
       XSETCAR (tem, Qnil);
+      /* In case the parameter appears more than once in the alist,
+	 clear it out.  */
+      for (tail = alist; CONSP (tail); tail = XCDR (tail))
+	if (CONSP (XCAR (tail))
+	    && EQ (XCAR (XCAR (tail)), param))
+	  XSETCAR (XCAR (tail), Qnil);
 #endif
     }
   else