Fix keyword argument parsing. Please bootstrap.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24248ded265122f5fd0e2d150ebae415eda27ba0..2a0840031b2aac94d28eeab1f18b50c4159d2b24 100644 (file)
--- 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-23  Richard Stallman  <rms@gnu.org>
 
        * battery.el (battery-linux-sysfs): Search for each field

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index b1861cf7dfabed9c3b1da3d383b9bfbd3d0aa98b..ae939c9c0e9a6b4ce9640b6edb33ddfd721092ce 100644 (file)
--- 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--")))

diff --git a/test/ChangeLog b/test/ChangeLog
index 9560397fa3f503480335b7e290a066b72a6e5981..15677e764681b2ca6cc8afb3b2b315dcf41cb84b 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
+       test: correct parsing of keyword arguments.
+
 2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
 
        * automated/package-test.el (package-test-describe-package):

diff --git a/test/automated/cl-lib.el b/test/automated/cl-lib.el
index 8b6ed6d6634a2782d131a3bb133b02d60ee3c90f..f7f4314e1cb9ee2491f84db9c99faf86b89f8e3e 100644 (file)
--- a/test/automated/cl-lib.el
+++ b/test/automated/cl-lib.el
@@ -195,4 +195,10 @@
   (should (eql (cl-mismatch "Aa" "aA") 0))
   (should (eql (cl-mismatch '(a b c) '(a b d)) 2)))
 
+(ert-deftest cl-lib-keyword-names-versus-values ()
+  (should (equal
+           (funcall (cl-function (lambda (&key a b) (list a b)))
+                    :b :a :a 42)
+           '(42 :a))))
+
 ;;; cl-lib.el ends here