Backport &key-parsing improvement from trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c956b0bdea1ea1c449c03c0f3bb5339754abb0f7..20b0a98f8d72e20a97a1bb60c8225e9a7a321536 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-24  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'
+       instead of cl-loop search function.
+
 2014-03-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * frameset.el (frameset--initial-params): Fix typo in parameter name.

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index ae939c9c0e9a6b4ce9640b6edb33ddfd721092ce..cd2d52a4b213842f77304372a026fcb517c7bb09 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -503,8 +503,7 @@ 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 `(cl-loop for cl--arg on ,restarg by #'cddr
-                               when (eq (car cl--arg) ',karg) return cl--arg)))
+                   (look `(plist-member ,restarg ',karg)))
              (and def cl--bind-enquote (setq def `',def))
              (if (cddr arg)
                  (let* ((temp (or (nth 2 arg) (make-symbol "--cl-var--")))