diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-05 14:03:44 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-05 14:03:44 -0800 |
| commit | 92b35af1fcea1bdb57d93f38ffc63046d81eadcc (patch) | |
| tree | 62189895b74928c146ce98c017bf63b327c9ad45 | |
| parent | 9f5e10534a1cc37e5bf80ea17830670beb4893b6 (diff) | |
| download | emacs-92b35af1fcea1bdb57d93f38ffc63046d81eadcc.tar.gz | |
* lisp/emacs-lisp/cl-macs.el (return-from): Fix doc typo.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b386bfc50a..f032f0c3396 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-05 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/cl-macs.el (return-from): Fix doc typo. + 2011-02-04 Glenn Morris <rgm@gnu.org> * calendar/diary-lib.el (diary-font-lock-keywords): diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 94c2312541c..4061e570cef 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -622,7 +622,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." |