* lisp/emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent

conversion to backquotes.

Fixes: debbugs:11652

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce57aff..cbc7518 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent
+       conversion to backquotes (bug#11652).
+
        Fix compiler-expansion of CL's cXXr functions (bug#11673).
        * emacs-lisp/cl-lib.el (cl--defalias): New function.
        (cl-values, cl-values-list, cl-copy-seq, cl-svref, cl-first)
@@ -15,6 +18,7 @@
        * emacs-lisp/cl-macs.el (cl--compiler-macro-adjoin)
        (cl--compiler-macro-list*): Add autoload cookie.
        (cl--compiler-macro-cXXr): New function.
+
        * help-fns.el (help-fns--compiler-macro): New function extracted from
        describe-function-1; follow aliases and use `compiler-macro' property.
        (describe-function-1): Use it.

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index a4caa0f..0b49563 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1108,7 +1108,7 @@ Valid clauses are:
                      (let ((temp-len (make-symbol "--cl-len--")))
                        (push (list temp-len `(length ,temp-seq))
                              loop-for-bindings)
-                       (push (list var `(elt ,temp-seq temp-idx))
+                       (push (list var `(elt ,temp-seq ,temp-idx))
                              cl--loop-symbol-macs)
                        (push `(< ,temp-idx ,temp-len) cl--loop-body))
                    (push (list var nil) loop-for-bindings)