diff options
| author | Eli Zaretskii | 2010-11-12 18:35:35 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-11-12 18:35:35 +0200 |
| commit | c7926fe29b737ef3c3bace253a22b6675d6295ac (patch) | |
| tree | 5be6099806078ea66318571a2b590855d5754584 /src | |
| parent | 6173c5b551055d0903cd8682456cd598a0661c2b (diff) | |
| download | emacs-c7926fe29b737ef3c3bace253a22b6675d6295ac.tar.gz emacs-c7926fe29b737ef3c3bace253a22b6675d6295ac.zip | |
Fix bug #7346: document load-file-name.
src/lread.c (Fload): Mention `load-in-progress' and `load-file-name'.
doc/lispref/loading.texi (How Programs Do Loading): Document `load-file-name'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lread.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7b5959c8db2..814062497bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-12 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * lread.c (Fload): Mention `load-in-progress' and | ||
| 4 | `load-file-name'. (Bug#7346) | ||
| 5 | |||
| 1 | 2010-11-09 Eli Zaretskii <eliz@gnu.org> | 6 | 2010-11-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * keyboard.c (kbd_buffer_nr_stored): Define only ifdef subprocesses. | 8 | * keyboard.c (kbd_buffer_nr_stored): Define only ifdef subprocesses. |
diff --git a/src/lread.c b/src/lread.c index c96e391a2d3..acadcb2d991 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1007,6 +1007,10 @@ Loading a file records its definitions, and its `provide' and | |||
| 1007 | `require' calls, in an element of `load-history' whose | 1007 | `require' calls, in an element of `load-history' whose |
| 1008 | car is the file name loaded. See `load-history'. | 1008 | car is the file name loaded. See `load-history'. |
| 1009 | 1009 | ||
| 1010 | While the file is in the process of being loaded, the variable | ||
| 1011 | `load-in-progress' is non-nil and the variable `load-file-name' | ||
| 1012 | is bound to the file's name. | ||
| 1013 | |||
| 1010 | Return t if the file exists and loads successfully. */) | 1014 | Return t if the file exists and loads successfully. */) |
| 1011 | (file, noerror, nomessage, nosuffix, must_suffix) | 1015 | (file, noerror, nomessage, nosuffix, must_suffix) |
| 1012 | Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; | 1016 | Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; |