aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-06-11 16:47:33 -0400
committerStefan Monnier2012-06-11 16:47:33 -0400
commit2eb87922965ced71c59e9ce6ae2e90afc0c8f421 (patch)
treed591b865f539a1d384cbc49be064046a106824ff
parent71adb94b713138836225744c8ed9281b558e2c51 (diff)
downloademacs-2eb87922965ced71c59e9ce6ae2e90afc0c8f421.tar.gz
emacs-2eb87922965ced71c59e9ce6ae2e90afc0c8f421.zip
* lisp/emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent
conversion to backquotes. Fixes: debbugs:11652
-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 @@
12012-06-11 Stefan Monnier <monnier@iro.umontreal.ca> 12012-06-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/cl-macs.el (cl-parse-loop-clause): Fix error in recent
4 conversion to backquotes (bug#11652).
5
3 Fix compiler-expansion of CL's cXXr functions (bug#11673). 6 Fix compiler-expansion of CL's cXXr functions (bug#11673).
4 * emacs-lisp/cl-lib.el (cl--defalias): New function. 7 * emacs-lisp/cl-lib.el (cl--defalias): New function.
5 (cl-values, cl-values-list, cl-copy-seq, cl-svref, cl-first) 8 (cl-values, cl-values-list, cl-copy-seq, cl-svref, cl-first)
@@ -15,6 +18,7 @@
15 * emacs-lisp/cl-macs.el (cl--compiler-macro-adjoin) 18 * emacs-lisp/cl-macs.el (cl--compiler-macro-adjoin)
16 (cl--compiler-macro-list*): Add autoload cookie. 19 (cl--compiler-macro-list*): Add autoload cookie.
17 (cl--compiler-macro-cXXr): New function. 20 (cl--compiler-macro-cXXr): New function.
21
18 * help-fns.el (help-fns--compiler-macro): New function extracted from 22 * help-fns.el (help-fns--compiler-macro): New function extracted from
19 describe-function-1; follow aliases and use `compiler-macro' property. 23 describe-function-1; follow aliases and use `compiler-macro' property.
20 (describe-function-1): Use it. 24 (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:
1108 (let ((temp-len (make-symbol "--cl-len--"))) 1108 (let ((temp-len (make-symbol "--cl-len--")))
1109 (push (list temp-len `(length ,temp-seq)) 1109 (push (list temp-len `(length ,temp-seq))
1110 loop-for-bindings) 1110 loop-for-bindings)
1111 (push (list var `(elt ,temp-seq temp-idx)) 1111 (push (list var `(elt ,temp-seq ,temp-idx))
1112 cl--loop-symbol-macs) 1112 cl--loop-symbol-macs)
1113 (push `(< ,temp-idx ,temp-len) cl--loop-body)) 1113 (push `(< ,temp-idx ,temp-len) cl--loop-body))
1114 (push (list var nil) loop-for-bindings) 1114 (push (list var nil) loop-for-bindings)