[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100203: Fix bug #7346: document load-file-name.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100203
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-11-12 18:35:35 +0200
message:
  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'.
modified:
  doc/lispref/ChangeLog
  doc/lispref/loading.texi
  src/ChangeLog
  src/lread.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-11-10 08:42:42 +0000
+++ b/doc/lispref/ChangeLog     2010-11-12 16:35:35 +0000
@@ -1,3 +1,8 @@
+2010-11-12  Eli Zaretskii  <address@hidden>
+
+       * loading.texi (How Programs Do Loading): Document
+       load-file-name.  (Bug#7346)
+
 2010-11-10  Glenn Morris  <address@hidden>
 
        * text.texi (Kill Functions, Low-Level Kill Ring): Small fixes.

=== modified file 'doc/lispref/loading.texi'
--- a/doc/lispref/loading.texi  2010-06-23 03:36:56 +0000
+++ b/doc/lispref/loading.texi  2010-11-12 16:35:35 +0000
@@ -107,6 +107,10 @@
 @code{load-path}, then all three suffixes in the second directory, and
 so on.  @xref{Library Search}.
 
+Whatever the name under which the file is eventually found, and the
+directory where Emacs found it, Emacs sets the value of the variable
address@hidden to that file's name.
+
 If you get a warning that @file{foo.elc} is older than @file{foo.el}, it
 means you should consider recompiling @file{foo.el}.  @xref{Byte
 Compilation}.
@@ -157,6 +161,12 @@
 file, and it is @code{nil} otherwise.
 @end defvar
 
address@hidden load-file-name
+When Emacs is in the process of loading a file, this variable's value
+is the name of that file, as Emacs found it during the search
+described earlier in this section.
address@hidden defvar
+
 @defvar load-read-function
 @anchor{Definition of load-read-function}
 @c do not allow page break at anchor; work around Texinfo deficiency.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-09 18:36:21 +0000
+++ b/src/ChangeLog     2010-11-12 16:35:35 +0000
@@ -1,3 +1,8 @@
+2010-11-12  Eli Zaretskii  <address@hidden>
+
+       * lread.c (Fload): Mention `load-in-progress' and
+       `load-file-name'.  (Bug#7346)
+
 2010-11-09  Eli Zaretskii  <address@hidden>
 
        * keyboard.c (kbd_buffer_nr_stored): Define only ifdef subprocesses.

=== modified file 'src/lread.c'
--- a/src/lread.c       2010-06-23 08:22:36 +0000
+++ b/src/lread.c       2010-11-12 16:35:35 +0000
@@ -1007,6 +1007,10 @@
 `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;