[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 1378680 31/64: Have the doc strings of `load-path
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 1378680 31/64: Have the doc strings of `load-path' and `require' mention each other |
Date: |
Sun, 01 May 2016 18:18:41 +0000 |
branch: emacs-25
commit 137868051e5ce4c4ba9cc92caa26fbf968e6f208
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'.
(cherry picked from commit 3eca9a03816f95da0030665223c0b5262f223ba7)
---
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 9bbbb6d..ef6055c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2762,17 +2762,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 d374406..ef58b20 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4508,6 +4508,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] emacs-25 2abc85e 41/64: Transform mentions of `eval-after-load' to `with-eval-after-load', (continued)
- [Emacs-diffs] emacs-25 2abc85e 41/64: Transform mentions of `eval-after-load' to `with-eval-after-load', Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 bbda22c 43/64: add-timeout doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 350792e 62/64: global-eldoc-mode doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 6b39501 55/64: Mention with-silent-modifications in the lispref manual, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 69f7940 63/64: cua-prefix-override-inhibit-delay doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 ad5572b 35/64: Fix custom types for cursor-in-non-selected-windows, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 8aa4147 64/64: tramp.texi: Revert last change due to backward compatibility, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 619f1ed 29/64: Move doc of backup-directory-alist to the Backup node, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 c3b3b90 61/64: normal-top-level-add-subdirs-to-load-path doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 2ef780f 34/64: Doc clarification to mwheel-scroll, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 1378680 31/64: Have the doc strings of `load-path' and `require' mention each other,
Lars Ingebrigtsen <=
- [Emacs-diffs] emacs-25 ed8474e 33/64: Clarify the doc of eval-expression-print-format, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 925af7e 27/64: Fill the doc string of font-lock-keywords, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 6d8c2d0 49/64: custom-buffer-style doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 3cbc1e3 07/64: Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]", Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 25b4cf3 56/64: Describe WHEN in all the define-obsolete- macros, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 9f27bcf 60/64: isearch-search-fun-function doc tweak, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 3bc26a7 53/64: clear-visited-file-modtime doc string fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 afb2257 46/64: completion-table-with-predicate doc string fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 d1ab001 58/64: Fmarker_position doc string clarification, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 ef32be6 48/64: Rearrange the doc of query-replace slightly, Lars Ingebrigtsen, 2016/05/01