aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 18:18:24 +0200
committerLars Magne Ingebrigtsen2011-07-02 18:18:24 +0200
commit69bb1ef7dfee275de3aacffc3600546213f9e96c (patch)
tree3dd99b4b5758f06287937da538f5f90685ee5d6e /src
parent08549772c2c28b138afc71718000ae76f0bab797 (diff)
downloademacs-69bb1ef7dfee275de3aacffc3600546213f9e96c.tar.gz
emacs-69bb1ef7dfee275de3aacffc3600546213f9e96c.zip
* lread.c (syms_of_lread): Mention single symbols defined by
`defvar' or `defconst' (bug#7154).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/lread.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d3c7b898dba..cb5d3bacba5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * lread.c (syms_of_lread): Mention single symbols defined by
4 `defvar' or `defconst' (bug#7154).
5
3 * fns.c (Frequire): Mention .el.gz files (bug#7314). 6 * fns.c (Frequire): Mention .el.gz files (bug#7314).
4 (Frequire): Mention get-load-suffixes. 7 (Frequire): Mention get-load-suffixes.
5 8
diff --git a/src/lread.c b/src/lread.c
index f937fa39f0f..a9b69a1977b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4420,9 +4420,11 @@ The remaining ENTRIES in the alist element describe the functions and
4420variables defined in that file, the features provided, and the 4420variables defined in that file, the features provided, and the
4421features required. Each entry has the form `(provide . FEATURE)', 4421features required. Each entry has the form `(provide . FEATURE)',
4422`(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)', 4422`(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)',
4423`(defface . SYMBOL)', or `(t . SYMBOL)'. In addition, an entry `(t 4423`(defface . SYMBOL)', or `(t . SYMBOL)'. Entries like `(t . SYMBOL)'
4424. SYMBOL)' may precede an entry `(defun . FUNCTION)', and means that 4424may precede a `(defun . FUNCTION)' entry, and means that SYMBOL was an
4425SYMBOL was an autoload before this file redefined it as a function. 4425autoload before this file redefined it as a function. In addition,
4426entries may also be single symbols, which means that SYMBOL was
4427defined by `defvar' or `defconst'.
4426 4428
4427During preloading, the file name recorded is relative to the main Lisp 4429During preloading, the file name recorded is relative to the main Lisp
4428directory. These file names are converted to absolute at startup. */); 4430directory. These file names are converted to absolute at startup. */);