Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
81a81c0f
Commit
81a81c0f
authored
Apr 05, 2001
by
Gerd Moellmann
Browse files
(Frequire): Doc fix. Rename parameter FILE_NAME to
FILENAME to bring it in synch with the documentation.
parent
441bf856
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
src/ChangeLog
src/ChangeLog
+3
-0
src/fns.c
src/fns.c
+8
-7
No files found.
src/ChangeLog
View file @
81a81c0f
2001-04-05 Gerd Moellmann <gerd@gnu.org>
* fns.c (Frequire): Doc fix. Rename parameter FILE_NAME to
FILENAME to bring it in synch with the documentation.
* xfaces.c (realizing_basic_faces_p): Renamed from
realize_default_face_p.
(realize_basic_faces): Set/clear realizing_basic_faces_p.
...
...
src/fns.c
View file @
81a81c0f
...
...
@@ -3051,13 +3051,14 @@ DEFUN ("require", Frequire, Srequire, 1, 3, 0,
If FEATURE is not a member of the list `features', then the feature\n\
is not loaded; so load the file FILENAME.\n\
If FILENAME is omitted, the printname of FEATURE is used as the file name,\n\
but in this case `load' insists on adding the suffix `.el' or `.elc'.
\n
\
and `load' will try to load this name appended with the suffix `.elc',\n\
`.el' or the unmodified name, in that order.\n\
If the optional third argument NOERROR is non-nil,\n\
then return nil if the file is not found.
\n
\
then return nil if the file is not found
instead of signaling an error
.\n\
Normally the return value is FEATURE.\n\
Th
is
normal messages at start and end of loading FILENAME are suppressed."
)
(
feature
,
file
_
name
,
noerror
)
Lisp_Object
feature
,
file
_
name
,
noerror
;
Th
e
normal messages at start and end of loading FILENAME are suppressed.")
(feature, filename, noerror)
Lisp_Object feature, filename, noerror;
{
register Lisp_Object tem;
CHECK_SYMBOL (feature, 0);
...
...
@@ -3073,8 +3074,8 @@ This normal messages at start and end of loading FILENAME are suppressed.")
record_unwind_protect (un_autoload, Vautoload_queue);
Vautoload_queue = Qt;
tem
=
Fload
(
NILP
(
file
_
name
)
?
Fsymbol_name
(
feature
)
:
file
_
name
,
noerror
,
Qt
,
Qnil
,
(
NILP
(
file
_
name
)
?
Qt
:
Qnil
));
tem = Fload (NILP (filename) ? Fsymbol_name (feature) : filename,
noerror, Qt, Qnil, (NILP (filename) ? Qt : Qnil));
/* If load failed entirely, return nil. */
if (NILP (tem))
return unbind_to (count, Qnil);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment