From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 30 May 2004 14:20:58 +0000 (+0000)
Subject: (Named Features): Clarify return value and meaning of NOERROR.
X-Git-Tag: ttn-vms-21-2-B4~5982
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d112d11fa99040cd21a73718d9c31d43f0b8e6d6;p=emacs.git

(Named Features): Clarify return value and meaning of NOERROR.
---

diff --git a/lispref/loading.texi b/lispref/loading.texi
index 893b41d2e51..4d13e48def5 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -687,9 +687,14 @@ However, in this case, @code{require} insists on finding @var{feature}
 with an added suffix; a file whose name is just @var{feature} won't be
 used.
 
-If loading the file fails to provide @var{feature}, @code{require}
-signals an error, @samp{Required feature @var{feature} was not
-provided}, unless @var{noerror} is non-@code{nil}.
+If @var{noerror} is non-@code{nil}, that suppresses errors from actual
+loading of the file.  In that case, @code{require} returns @code{nil}
+if loading the file fails.  Normally, @code{require} returns
+@var{feature}.
+
+If loading the file succeeds but does not provide @var{feature},
+@code{require} signals an error, @samp{Required feature @var{feature}
+was not provided}.
 @end defun
 
 @defun featurep feature &optional subfeature