summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-06-11 16:47:33 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-06-11 16:47:33 -0400
commit2eb87922965ced71c59e9ce6ae2e90afc0c8f421 (patch)
treed591b865f539a1d384cbc49be064046a106824ff /lisp
parent71adb94b713138836225744c8ed9281b558e2c51 (diff)
downloademacs-2eb87922965ced71c59e9ce6ae2e90afc0c8f421.tar.gz
* lisp/emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent
conversion to backquotes. Fixes: debbugs:11652
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl-macs.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce57affbda7..cbc75182f0f 100644
--- 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 a4caa0ff8b3..0b49563adff 100644
--- 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)