diff options
| author | Juanma Barranquero | 2012-11-15 22:01:25 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2012-11-15 22:01:25 +0100 |
| commit | 662b0ee67c701dbae7c15094e2d6d3d64dfe5e8e (patch) | |
| tree | 78fbdf19c8820c3f543b3047046cc0a4bf2cc781 | |
| parent | eb31fa401dd2163032c6d3320778008043bfde55 (diff) | |
| download | emacs-662b0ee67c701dbae7c15094e2d6d3d64dfe5e8e.tar.gz emacs-662b0ee67c701dbae7c15094e2d6d3d64dfe5e8e.zip | |
lisp/emacs-lisp/cl-macs.el (cl-loop, cl-do, cl-do*): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c84c6fe9dd2..81204ca2332 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-11-15 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/cl-macs.el (cl-loop, cl-do, cl-do*): Doc fixes. | ||
| 4 | |||
| 1 | 2012-11-15 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-11-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/cl-macs.el (cl-flet, cl-flet*): Fix docstring (bug#12895). | 7 | * emacs-lisp/cl-macs.el (cl-flet, cl-flet*): Fix docstring (bug#12895). |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 52188c53e6f..c0b6be44d7b 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -756,7 +756,7 @@ This is compatible with Common Lisp, but note that `defun' and | |||
| 756 | 756 | ||
| 757 | ;;;###autoload | 757 | ;;;###autoload |
| 758 | (defmacro cl-loop (&rest loop-args) | 758 | (defmacro cl-loop (&rest loop-args) |
| 759 | "The Common Lisp `cl-loop' macro. | 759 | "The Common Lisp `loop' macro. |
| 760 | Valid clauses are: | 760 | Valid clauses are: |
| 761 | for VAR from/upfrom/downfrom NUM to/upto/downto/above/below NUM by NUM, | 761 | for VAR from/upfrom/downfrom NUM to/upto/downto/above/below NUM by NUM, |
| 762 | for VAR in LIST by FUNC, for VAR on LIST by FUNC, for VAR = INIT then EXPR, | 762 | for VAR in LIST by FUNC, for VAR on LIST by FUNC, for VAR = INIT then EXPR, |
| @@ -1501,7 +1501,7 @@ such that COMBO is equivalent to (and . CLAUSES)." | |||
| 1501 | 1501 | ||
| 1502 | ;;;###autoload | 1502 | ;;;###autoload |
| 1503 | (defmacro cl-do (steps endtest &rest body) | 1503 | (defmacro cl-do (steps endtest &rest body) |
| 1504 | "The Common Lisp `cl-do' loop. | 1504 | "The Common Lisp `do' loop. |
| 1505 | 1505 | ||
| 1506 | \(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)" | 1506 | \(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)" |
| 1507 | (declare (indent 2) | 1507 | (declare (indent 2) |
| @@ -1513,7 +1513,7 @@ such that COMBO is equivalent to (and . CLAUSES)." | |||
| 1513 | 1513 | ||
| 1514 | ;;;###autoload | 1514 | ;;;###autoload |
| 1515 | (defmacro cl-do* (steps endtest &rest body) | 1515 | (defmacro cl-do* (steps endtest &rest body) |
| 1516 | "The Common Lisp `cl-do*' loop. | 1516 | "The Common Lisp `do*' loop. |
| 1517 | 1517 | ||
| 1518 | \(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)" | 1518 | \(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)" |
| 1519 | (declare (indent 2) (debug cl-do)) | 1519 | (declare (indent 2) (debug cl-do)) |