Mercurial > emacs
changeset 106689:de63af995d1c
* 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).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 01 Jan 2010 13:14:22 -0500 |
| parents | 554599f8828c |
| children | 4d6afab8b7cb |
| files | doc/lispref/ChangeLog doc/lispref/loading.texi src/ChangeLog src/lread.c |
| diffstat | 4 files changed, 29 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispref/ChangeLog Fri Jan 01 12:14:05 2010 -0500 +++ b/doc/lispref/ChangeLog Fri Jan 01 13:14:22 2010 -0500 @@ -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.
--- a/doc/lispref/loading.texi Fri Jan 01 12:14:05 2010 -0500 +++ b/doc/lispref/loading.texi Fri Jan 01 13:14:22 2010 -0500 @@ -823,13 +823,14 @@ @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. +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 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: +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}
--- a/src/ChangeLog Fri Jan 01 12:14:05 2010 -0500 +++ b/src/ChangeLog Fri Jan 01 13:14:22 2010 -0500 @@ -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).
--- a/src/lread.c Fri Jan 01 12:14:05 2010 -0500 +++ b/src/lread.c Fri Jan 01 13:14:22 2010 -0500 @@ -4377,20 +4377,20 @@ 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. */);