* src/lread.c (syms_of_lread): Make it clearer that these are the

names of loaded files (Bug#5068).

* doc/lispref/loading.texi (Where Defined): Make it clearer that these
are loaded files (Bug#5068).

4 files changed, 30 insertions, 21 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8e88e5026e8..0f4abc7a984 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+	* loading.texi (Where Defined): Make it clearer that these are
+	loaded files (Bug#5068).
+
 2009-12-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* minibuf.texi (Completion Styles): Document `initials' style.
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 8ccc0071e2a..416d4513b67 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -823,13 +823,14 @@ without extension.
 @code{load-history}.
 
 @defvar load-history
-This variable's value is an alist connecting library file names with the
-names of functions and variables they define, the features they provide,
-and the features they require.
-
-Each element is a list and describes one library.  The @sc{car} of the
-list is the absolute file name of the library, as a string.  The rest
-of the list elements have these forms:
+This value of this variable is an alist that associates the names of
+loaded library files with the names of the functions and variables
+they defined, as well as the features they provided or required.
+
+Each element in this alist describes one loaded library (including
+libraries that are preloaded at startup).  It is a list whose @sc{car}
+is the absolute file name of the library (a string).  The rest of the
+list elements have these forms:
 
 @table @code
 @item @var{var}
diff --git a/src/ChangeLog b/src/ChangeLog
index d6447678e0b..73000341f68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-01  Chong Yidong  <cyd@stupidchicken.com>
 
+	* lread.c (syms_of_lread): Make it clearer that these are the
+	names of loaded files (Bug#5068).
+
 	* eval.c (run_hook_with_args): Handle the case where the global
 	value has the obsolete single-function form (Bug#5026).
 
diff --git a/src/lread.c b/src/lread.c
index 0649c638d98..50d2702639e 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4377,20 +4377,20 @@ the rest of the FORMS.  */);
   Vafter_load_alist = Qnil;
 
   DEFVAR_LISP ("load-history", &Vload_history,
-	       doc: /* Alist mapping file names to symbols and features.
-Each alist element is a list that starts with a file name,
-except for one element (optional) that starts with nil and describes
-definitions evaluated from buffers not visiting files.
-
-The file name is absolute and is the true file name (i.e. it doesn't
-contain symbolic links) of the loaded file.
-
-The remaining elements of each list are symbols defined as variables
-and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)',
-`(defun . FUNCTION)', `(autoload . SYMBOL)', `(defface . SYMBOL)'
-and `(t . SYMBOL)'.  An element `(t . SYMBOL)' precedes an entry
-`(defun . FUNCTION)', and means that SYMBOL was an autoload before
-this file redefined it as a function.
+	       doc: /* Alist mapping loaded file names to symbols and features.
+Each alist element should be a list (FILE-NAME ENTRIES...), where
+FILE-NAME is the name of a file that has been loaded into Emacs.
+The file name is absolute and true (i.e. it doesn't contain symlinks).
+As an exception, one of the alist elements may have FILE-NAME nil,
+for symbols and features not associated with any file.
+
+The remaining ENTRIES in the alist element describe the functions and
+variables defined in that file, the features provided, and the
+features required.  Each entry has the form `(provide . FEATURE)',
+`(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)',
+`(defface . SYMBOL)', or `(t . SYMBOL)'.  In addition, an entry `(t
+. SYMBOL)' may precede an entry `(defun . FUNCTION)', and means that
+SYMBOL was an autoload before this file redefined it as a function.
 
 During preloading, the file name recorded is relative to the main Lisp
 directory.  These file names are converted to absolute at startup.  */);