* lisp/frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0cb057e475a0733fe04e8d0b6cacf85b7ea0cec..3d608bb860b905ff95e6fa56c3ae89f4c412019b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/frame.el b/lisp/frame.el
index 10abed1ff19fbf4af321bbd0e1dab7e64e89b4a5..534d6a2b4e7cb7709bb687c35c337064f46726bb 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -736,11 +736,11 @@ the new frame according to its own rules."
       (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)