aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-04-30 16:44:06 +0200
committerLars Ingebrigtsen2016-05-01 19:27:12 +0200
commit137868051e5ce4c4ba9cc92caa26fbf968e6f208 (patch)
tree9bb251311c5a5c68eaa867088989098c64143fee /src
parenta73de71b848da17719dcbbb9206302c09e0f79b9 (diff)
downloademacs-137868051e5ce4c4ba9cc92caa26fbf968e6f208.tar.gz
emacs-137868051e5ce4c4ba9cc92caa26fbf968e6f208.zip
Have the doc strings of `load-path' and `require' mention each other
* src/fns.c (Frequire): Mention `load-path' and fill the doc string (bug#18829). * src/lread.c (syms_of_lread): Mention that `require' uses `load-path'. (cherry picked from commit 3eca9a03816f95da0030665223c0b5262f223ba7)
Diffstat (limited to 'src')
-rw-r--r--src/fns.c29
-rw-r--r--src/lread.c1
2 files changed, 19 insertions, 11 deletions
diff --git a/src/fns.c b/src/fns.c
index 9bbbb6d7b71..ef6055c17d1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2762,17 +2762,24 @@ require_unwind (Lisp_Object old_value)
2762 2762
2763DEFUN ("require", Frequire, Srequire, 1, 3, 0, 2763DEFUN ("require", Frequire, Srequire, 1, 3, 0,
2764 doc: /* If feature FEATURE is not loaded, load it from FILENAME. 2764 doc: /* If feature FEATURE is not loaded, load it from FILENAME.
2765If FEATURE is not a member of the list `features', then the feature 2765If FEATURE is not a member of the list `features', then the feature is
2766is not loaded; so load the file FILENAME. 2766not loaded; so load the file FILENAME.
2767If FILENAME is omitted, the printname of FEATURE is used as the file name, 2767
2768and `load' will try to load this name appended with the suffix `.elc', 2768If FILENAME is omitted, the printname of FEATURE is used as the file
2769`.el', or the system-dependent suffix for dynamic module files, in that 2769name, and `load' will try to load this name appended with the suffix
2770order. The name without appended suffix will not be used. 2770`.elc', `.el', or the system-dependent suffix for dynamic module
2771See `get-load-suffixes' for the complete list of suffixes. 2771files, in that order. The name without appended suffix will not be
2772If the optional third argument NOERROR is non-nil, 2772used. See `get-load-suffixes' for the complete list of suffixes.
2773then return nil if the file is not found instead of signaling an error. 2773
2774Normally the return value is FEATURE. 2774The directories in `load-path' are searched when trying to find the
2775The normal messages at start and end of loading FILENAME are suppressed. */) 2775file name.
2776
2777If the optional third argument NOERROR is non-nil, then return nil if
2778the file is not found instead of signaling an error. Normally the
2779return value is FEATURE.
2780
2781The normal messages at start and end of loading FILENAME are
2782suppressed. */)
2776 (Lisp_Object feature, Lisp_Object filename, Lisp_Object noerror) 2783 (Lisp_Object feature, Lisp_Object filename, Lisp_Object noerror)
2777{ 2784{
2778 Lisp_Object tem; 2785 Lisp_Object tem;
diff --git a/src/lread.c b/src/lread.c
index d374406e7b9..ef58b20070d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4508,6 +4508,7 @@ were read in. */);
4508 doc: /* List of directories to search for files to load. 4508 doc: /* List of directories to search for files to load.
4509Each element is a string (directory file name) or nil (meaning 4509Each element is a string (directory file name) or nil (meaning
4510`default-directory'). 4510`default-directory').
4511This list is consulted by the `require' function.
4511Initialized during startup as described in Info node `(elisp)Library Search'. 4512Initialized during startup as described in Info node `(elisp)Library Search'.
4512Use `directory-file-name' when adding items to this path. However, Lisp 4513Use `directory-file-name' when adding items to this path. However, Lisp
4513programs that process this list should tolerate directories both with 4514programs that process this list should tolerate directories both with