diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-09 23:04:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-09 23:04:56 -0800 |
| commit | be6d99804b3efdecf3660c4b51da1945e955fb4d (patch) | |
| tree | 99b523c445f7b95572ab668f4e878cd703ff3527 /lisp/emacs-lisp | |
| parent | dd4638842ad1921562bc66049ec81a4530651cdf (diff) | |
| parent | 67f02b82f496be403353a1dc918cc4f2278841bb (diff) | |
| download | emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.tar.gz emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.tar.bz2 emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 05bfa0f262e..e10dc10447c 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -282,7 +282,7 @@ Not documented ;;;;;; do-all-symbols do-symbols dotimes dolist do* do loop return-from ;;;;;; return block etypecase typecase ecase case load-time-value ;;;;;; eval-when destructuring-bind function* defmacro* defun* gentemp -;;;;;; gensym) "cl-macs" "cl-macs.el" "8b2ce9c2ec0e273606bb37c333c4bdde") +;;;;;; gensym) "cl-macs" "cl-macs.el" "0904b956872432ae7cc5fa9abcefce63") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -389,7 +389,7 @@ This is equivalent to `(return-from nil RESULT)'. (autoload 'return-from "cl-macs" "\ 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. |