diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-05 14:30:14 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-05 14:30:14 -0800 |
| commit | 233ba4d924933cb56129bd7511e6137b7c0b8e3e (patch) | |
| tree | 741044a058b02f007a55e1fdbe8ac480feba0ada /lisp/emacs-lisp | |
| parent | 827b77e90f4f3a86abfc82a07a8319f5f4cfb3d3 (diff) | |
| parent | a60287ff994ec4d07779128f0df5500bed1b3cf9 (diff) | |
| download | emacs-233ba4d924933cb56129bd7511e6137b7c0b8e3e.tar.gz emacs-233ba4d924933cb56129bd7511e6137b7c0b8e3e.tar.bz2 emacs-233ba4d924933cb56129bd7511e6137b7c0b8e3e.zip | |
Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index bef334b544c..80e95724f1f 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -628,7 +628,7 @@ This is equivalent to `(return-from nil RESULT)'." ;;;###autoload (defmacro return-from (name &optional result) "Return from the block named NAME. -This jump out to the innermost enclosing `(block NAME ...)' form, +This jumps out to the innermost enclosing `(block NAME ...)' form, returning RESULT from that form (or nil if RESULT is omitted). This is compatible with Common Lisp, but note that `defun' and `defmacro' do not create implicit blocks as they do in Common Lisp." |