* emacs-lisp/cl-macs.el (cl-block-wrapper): Fix typo that broke CL

blocks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a0f8084c53741a89c77582d73d70e628729bc1b..ea512d99559eb208eccbff180aabe4c30e1604f6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-20  Christian Ohler  <ohler@gnu.org>
+
+       * emacs-lisp/cl-macs.el (cl-block-wrapper): Fix typo that broke CL
+       blocks.
+
 2011-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * 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 d4279a1b2008a38085aef1101bc3d90f6f8172db..7aac5bdaa01fcf263ec1a7dbb8decabf740c2766 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2612,7 +2612,7 @@ and then returning foo."
     ;; FIXME: To avoid re-applying macroexpand-all, we'd like to be able
     ;; to indicate that this return value is already fully expanded.
     (if (cdr cl-entry)
-        `(catch (nth 1 cl-form) ,@(cdr cl-body))
+        `(catch ,(nth 1 cl-form) ,@(cdr cl-body))
       cl-body)))
 
 (define-compiler-macro cl-block-throw (cl-tag cl-value)