diff options
| author | Christian Ohler | 2011-03-20 20:48:12 +1100 |
|---|---|---|
| committer | Christian Ohler | 2011-03-20 20:48:12 +1100 |
| commit | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (patch) | |
| tree | f711bae8a9f11434126aeb09594b0510ac183557 | |
| parent | bf02cb227d98626c3dff61c69fa8b4ce523d71bd (diff) | |
| download | emacs-a08a25d7aaf251aa18f2ef747be53734bc55cae9.tar.gz emacs-a08a25d7aaf251aa18f2ef747be53734bc55cae9.zip | |
* emacs-lisp/cl-macs.el (cl-block-wrapper): Fix typo that broke CL
blocks.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a0f8084c53..ea512d99559 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-20 Christian Ohler <ohler@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/cl-macs.el (cl-block-wrapper): Fix typo that broke CL | ||
| 4 | blocks. | ||
| 5 | |||
| 1 | 2011-03-20 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2011-03-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/debug.el (debugger-setup-buffer): Revert local change to | 8 | * emacs-lisp/debug.el (debugger-setup-buffer): Revert local change to |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index d4279a1b200..7aac5bdaa01 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -2612,7 +2612,7 @@ and then returning foo." | |||
| 2612 | ;; FIXME: To avoid re-applying macroexpand-all, we'd like to be able | 2612 | ;; FIXME: To avoid re-applying macroexpand-all, we'd like to be able |
| 2613 | ;; to indicate that this return value is already fully expanded. | 2613 | ;; to indicate that this return value is already fully expanded. |
| 2614 | (if (cdr cl-entry) | 2614 | (if (cdr cl-entry) |
| 2615 | `(catch (nth 1 cl-form) ,@(cdr cl-body)) | 2615 | `(catch ,(nth 1 cl-form) ,@(cdr cl-body)) |
| 2616 | cl-body))) | 2616 | cl-body))) |
| 2617 | 2617 | ||
| 2618 | (define-compiler-macro cl-block-throw (cl-tag cl-value) | 2618 | (define-compiler-macro cl-block-throw (cl-tag cl-value) |