From: Luc Teirlinck <teirllm@auburn.edu>
Date: Fri, 30 Dec 2005 02:59:47 +0000 (+0000)
Subject: (noreturn, 1value): Doc fixes.
X-Git-Tag: emacs-pretest-22.0.90~4995
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70c6db6c462fe42a70073c5e5f093b23f2bb374b;p=emacs.git

(noreturn, 1value): Doc fixes.
---

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'.")
 (defalias 'not 'null)
 
 (defmacro noreturn (form)
-  "Evaluates FORM, with the expectation that the evaluation will signal an error
-instead of returning to its caller.  If FORM does return, an error is
-signaled."
+  "Evaluate FORM, expecting it not to return.
+If FORM does return, signal an error."
   `(prog1 ,form
      (error "Form marked with `noreturn' did return")))
 
 (defmacro 1value (form)
-  "Evaluates FORM, with the expectation that the same value will be returned
-from all evaluations of FORM.  This is the global do-nothing
-version of `1value'.  There is also `testcover-1value' that
-complains if FORM ever does return differing values."
+  "Evaluate FORM, expecting a constant return value.
+This is the global do-nothing version.  There is also `testcover-1value'
+that complains if FORM ever does return differing values."
   form)
 
 (defmacro lambda (&rest cdr)