summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-11-12 18:35:35 +0200
committerEli Zaretskii <eliz@gnu.org>2010-11-12 18:35:35 +0200
commit886fa2622b34bad402a0b8638014ac7ac50b5e6e (patch)
tree1c5c637869754e890edd104b29b9de60730dcb3e /src
parente5be38a58ff976ffeb6c60671bff02e858bc3583 (diff)
downloademacs-886fa2622b34bad402a0b8638014ac7ac50b5e6e.tar.gz
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/ChangeLog5
-rw-r--r--src/lread.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7c0dd0ae956..7787f903364 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-12 Eli Zaretskii <eliz@gnu.org>
+
+ * lread.c (Fload): Mention `load-in-progress' and
+ `load-file-name'. (Bug#7346)
+
2010-11-09 Eli Zaretskii <eliz@gnu.org>
* 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
`require' calls, in an element of `load-history' whose
car is the file name loaded. See `load-history'.
+While the file is in the process of being loaded, the variable
+`load-in-progress' is non-nil and the variable `load-file-name'
+is bound to the file's name.
+
Return t if the file exists and loads successfully. */)
(file, noerror, nomessage, nosuffix, must_suffix)
Lisp_Object file, noerror, nomessage, nosuffix, must_suffix;