summaryrefslogtreecommitdiff
path: root/lispref/loading.texi
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2004-05-30 14:20:58 +0000
committerRichard M. Stallman <rms@gnu.org>2004-05-30 14:20:58 +0000
commitd112d11fa99040cd21a73718d9c31d43f0b8e6d6 (patch)
treee815509f72d34190391b4be07b6810612001df5e /lispref/loading.texi
parent18684a3ad1cfb3ccc6c7223aa4de8a9a90fce05b (diff)
downloademacs-d112d11fa99040cd21a73718d9c31d43f0b8e6d6.tar.gz
(Named Features): Clarify return value and meaning of NOERROR.
Diffstat (limited to 'lispref/loading.texi')
-rw-r--r--lispref/loading.texi11
1 files changed, 8 insertions, 3 deletions
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