aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-12-30 02:59:47 +0000
committerLuc Teirlinck2005-12-30 02:59:47 +0000
commit70c6db6c462fe42a70073c5e5f093b23f2bb374b (patch)
tree8b278929ec197a230bc055224a66d8358a034128
parent9f126fd015010307f1578420692a1f2f70b13e7a (diff)
downloademacs-70c6db6c462fe42a70073c5e5f093b23f2bb374b.tar.gz
emacs-70c6db6c462fe42a70073c5e5f093b23f2bb374b.zip
(noreturn, 1value): Doc fixes.
-rw-r--r--lisp/subr.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index deaa06c7e5d..d7512a36ac2 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -42,17 +42,15 @@ Each element of this list holds the arguments to one call to `defcustom'.")
42(defalias 'not 'null) 42(defalias 'not 'null)
43 43
44(defmacro noreturn (form) 44(defmacro noreturn (form)
45 "Evaluates FORM, with the expectation that the evaluation will signal an error 45 "Evaluate FORM, expecting it not to return.
46instead of returning to its caller. If FORM does return, an error is 46If FORM does return, signal an error."
47signaled."
48 `(prog1 ,form 47 `(prog1 ,form
49 (error "Form marked with `noreturn' did return"))) 48 (error "Form marked with `noreturn' did return")))
50 49
51(defmacro 1value (form) 50(defmacro 1value (form)
52 "Evaluates FORM, with the expectation that the same value will be returned 51 "Evaluate FORM, expecting a constant return value.
53from all evaluations of FORM. This is the global do-nothing 52This is the global do-nothing version. There is also `testcover-1value'
54version of `1value'. There is also `testcover-1value' that 53that complains if FORM ever does return differing values."
55complains if FORM ever does return differing values."
56 form) 54 form)
57 55
58(defmacro lambda (&rest cdr) 56(defmacro lambda (&rest cdr)