aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl-macs.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93eaffde2cf..6fcef76911c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-02-05 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/cl-macs.el (return-from): Fix doc typo.
4
12011-02-04 Glenn Morris <rgm@gnu.org> 52011-02-04 Glenn Morris <rgm@gnu.org>
2 6
3 * calendar/diary-lib.el (diary-font-lock-keywords): 7 * 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)'."
622;;;###autoload 622;;;###autoload
623(defmacro return-from (name &optional result) 623(defmacro return-from (name &optional result)
624 "Return from the block named NAME. 624 "Return from the block named NAME.
625This jump out to the innermost enclosing `(block NAME ...)' form, 625This jumps out to the innermost enclosing `(block NAME ...)' form,
626returning RESULT from that form (or nil if RESULT is omitted). 626returning RESULT from that form (or nil if RESULT is omitted).
627This is compatible with Common Lisp, but note that `defun' and 627This is compatible with Common Lisp, but note that `defun' and
628`defmacro' do not create implicit blocks as they do in Common Lisp." 628`defmacro' do not create implicit blocks as they do in Common Lisp."