[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3eca9a0 5/9: Have the doc strings of `load-path' an
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 3eca9a0 5/9: Have the doc strings of `load-path' and `require' mention each other |
Date: |
Sat, 30 Apr 2016 15:31:17 +0000 |
branch: master
commit 3eca9a03816f95da0030665223c0b5262f223ba7
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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'.
---
src/fns.c | 29 ++++++++++++++++++-----------
src/lread.c | 1 +
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/fns.c b/src/fns.c
index 617a8e8..b21e93d 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2808,17 +2808,24 @@ 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.
-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.
-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.
-The normal messages at start and end of loading FILENAME are suppressed. */)
+If FEATURE is not a member of the list `features', then the feature is
+not loaded; so load the 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.
+
+The directories in `load-path' are searched when trying to find the
+file name.
+
+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.
+
+The normal messages at start and end of loading FILENAME are
+suppressed. */)
(Lisp_Object feature, Lisp_Object filename, Lisp_Object noerror)
{
Lisp_Object tem;
diff --git a/src/lread.c b/src/lread.c
index 6e97e07..4450728 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4576,6 +4576,7 @@ were read in. */);
doc: /* List of directories to search for files to load.
Each element is a string (directory file name) or nil (meaning
`default-directory').
+This list is consulted by the `require' function.
Initialized during startup as described in Info node `(elisp)Library Search'.
Use `directory-file-name' when adding items to this path. However, Lisp
programs that process this list should tolerate directories both with
- [Emacs-diffs] master updated (bc00dcf -> 66379a7), Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master 2824c58 4/9: Doc fix for insert-pair-alist, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master e77b8d8 3/9: Move doc of backup-directory-alist to the Backup node, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master 619e0ae 6/9: Explictly explain that package-initialize loads the packages, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master 3eca9a0 5/9: Have the doc strings of `load-path' and `require' mention each other,
Lars Ingebrigtsen <=
- [Emacs-diffs] master c05716d 1/9: Fill the doc string of font-lock-keywords, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master 6f86ec8 7/9: Add a variable to control "shorter command" suggestions, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master 12515d8 8/9: Document extended-command-suggest-shorter, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master c05d186 2/9: Tiny doc clarification for create-fontset-from-fontset-spec, Lars Ingebrigtsen, 2016/04/30
- [Emacs-diffs] master 66379a7 9/9: (extended-command-suggest-shorter): Add a version string, Lars Ingebrigtsen, 2016/04/30