2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e49f70f0b2..78229507684 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+        * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
+        list to look for keyword arguments instead of `memq', fixing
+        (Bug#3647) --- unfortunately, only for freshly-compiled code.
+        Please make bootstrap.
+
 2014-03-22  Glenn Morris  <rgm@gnu.org>
 
         * dired.el (dired-read-regexp): Make obsolete.
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index b1861cf7dfa..ae939c9c0e9 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -503,7 +503,8 @@ its argument list allows full Common Lisp conventions."
                    (varg (if (consp (car arg)) (cl-cadar arg) (car arg)))
                    (def (if (cdr arg) (cadr arg)
                           (or (car cl--bind-defs) (cadr (assq varg cl--bind-defs)))))
-                   (look `(memq ',karg ,restarg)))
+                   (look `(cl-loop for cl--arg on ,restarg by #'cddr
+                               when (eq (car cl--arg) ',karg) return cl--arg)))
               (and def cl--bind-enquote (setq def `',def))
               (if (cddr arg)
                   (let* ((temp (or (nth 2 arg) (make-symbol "--cl-var--")))