From: Chong Yidong Date: Tue, 13 Jul 2010 17:02:27 +0000 (-0400) Subject: * lisp/frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~57^2~3 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21bd02a62dcf3529e1591a43a9f80d81d13e6915;p=emacs.git * lisp/frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a0cb057e475..3d608bb860b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-07-13 Chong Yidong + + * frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625). + 2010-07-13 Adrian Robert * term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew diff --git a/lisp/frame.el b/lisp/frame.el index 10abed1ff19..534d6a2b4e7 100644 --- 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)