# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1279040547 14400
# Node ID c196ca51171c8229343507e5bcc4c7a8ab219d05
# Parent  1a678cf6a4cd2b5bf237faeec3e0684256acefec
* lisp/frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625).

diff -r 1a678cf6a4cd -r c196ca51171c lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 13 14:03:42 2010 +0300
+++ b/lisp/ChangeLog	Tue Jul 13 13:02:27 2010 -0400
@@ -1,3 +1,7 @@
+2010-07-13  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625).
+
 2010-07-13  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew
diff -r 1a678cf6a4cd -r c196ca51171c lisp/frame.el
--- a/lisp/frame.el	Tue Jul 13 14:03:42 2010 +0300
+++ b/lisp/frame.el	Tue Jul 13 13:02:27 2010 -0400
@@ -736,11 +736,11 @@
       (error "Don't know how to create a frame on window system %s" w))
     ;; Add parameters from `window-system-default-frame-alist'.
     (dolist (p (cdr (assq w window-system-default-frame-alist)))
-      (unless (memq (car p) params)
+      (unless (assq (car p) params)
 	(push p params)))
     ;; Add parameters from `default-frame-alist'.
     (dolist (p default-frame-alist)
-      (unless (memq (car p) params)
+      (unless (assq (car p) params)
 	(push p params)))
     ;; Now make the frame.
     (run-hooks 'before-make-frame-hook)