summaryrefslogtreecommitdiff
path: root/src/fns.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2022-01-10 22:34:55 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2022-01-10 22:34:55 -0500
commit73b15f45f9369f511985b7b424c1a6cc54b323c2 (patch)
tree81aa29ac8e6a6339a5da256df5fa591357098fe0 /src/fns.c
parent4d621ffd30749de93519161c5094e40ee1b08fb6 (diff)
parent99a9b545f09dc78494e62c9dc34c0cdb280b879e (diff)
downloademacs-73b15f45f9369f511985b7b424c1a6cc54b323c2.tar.gz
Merge remote-tracking branch 'origin/emacs-28' into trunk
Diffstat (limited to 'src/fns.c')
-rw-r--r--src/fns.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/fns.c b/src/fns.c
index 86c49e6fc6b..7b9142d4718 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3105,25 +3105,25 @@ require_unwind (Lisp_Object old_value)
}
DEFUN ("require", Frequire, Srequire, 1, 3, 0,
- doc: /* If feature FEATURE is not loaded, load it from FILENAME.
-If FEATURE is not a member of the list `features', then the feature is
-not loaded; so load the file FILENAME.
+ doc: /* If FEATURE is not already loaded, load it from FILENAME.
+If FEATURE is not a member of the list `features', then the feature was
+not yet loaded; so load it from file FILENAME.
If FILENAME is omitted, the printname of FEATURE is used as the file
-name, and `load' will try to load this name appended with the suffix
-`.elc', `.el', or the system-dependent suffix for dynamic module
-files, in that order. The name without appended suffix will not be
-used. See `get-load-suffixes' for the complete list of suffixes.
+name, and `load' is called to try to load the file by that name, after
+appending the suffix `.elc', `.el', or the system-dependent suffix for
+dynamic module files, in that order; but the function will not try to
+load the file without any suffix. See `get-load-suffixes' for the
+complete list of suffixes.
-The directories in `load-path' are searched when trying to find the
-file name.
+To find the file, this function searches that directories in `load-path'.
-If the optional third argument NOERROR is non-nil, then return nil if
-the file is not found instead of signaling an error. Normally the
-return value is FEATURE.
+If the optional third argument NOERROR is non-nil, then, if
+the file is not found, the function returns nil instead of signaling
+an error. Normally the return value is FEATURE.
-The normal messages at start and end of loading FILENAME are
-suppressed. */)
+The normal messages issued by `load' at start and end of loading
+FILENAME are suppressed. */)
(Lisp_Object feature, Lisp_Object filename, Lisp_Object noerror)
{
Lisp_Object tem;