aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-08-15 17:59:40 +0000
committerChong Yidong2009-08-15 17:59:40 +0000
commitf6de8a37189072973e6304e54b51a91ba6dc2641 (patch)
treed1be8543c3fd9d51117ec6789c0d01063a4264a2
parent9d73a99e31ac6f10e1ac019f3daa59196c2d746e (diff)
downloademacs-f6de8a37189072973e6304e54b51a91ba6dc2641.tar.gz
emacs-f6de8a37189072973e6304e54b51a91ba6dc2641.zip
* customize.texi (Common Keywords): Add xref to Loading.
* loading.texi (How Programs Do Loading): Add xref to Lisp Libraries node in the Emacs manual.
-rw-r--r--doc/lispref/ChangeLog7
-rw-r--r--doc/lispref/customize.texi4
-rw-r--r--doc/lispref/loading.texi3
3 files changed, 11 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4ef9a4c35eb..9ab5b15b4bc 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
12009-08-15 Chong Yidong <cyd@stupidchicken.com>
2
3 * customize.texi (Common Keywords): Add xref to Loading.
4
5 * loading.texi (How Programs Do Loading): Add xref to Lisp
6 Libraries node in the Emacs manual.
7
12009-08-13 Chong Yidong <cyd@stupidchicken.com> 82009-08-13 Chong Yidong <cyd@stupidchicken.com>
2 9
3 * objects.texi (Meta-Char Syntax): Add xref to Strings of Events. 10 * objects.texi (Meta-Char Syntax): Add xref to Strings of Events.
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 8db58eaae49..c533d8ea834 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -115,8 +115,8 @@ none at all.
115@item :load @var{file} 115@item :load @var{file}
116@kindex load@r{, customization keyword} 116@kindex load@r{, customization keyword}
117Load file @var{file} (a string) before displaying this customization 117Load file @var{file} (a string) before displaying this customization
118item. Loading is done with @code{load-library}, and only if the file is 118item (@pxref{Loading}). Loading is done with @code{load}, and only if
119not already loaded. 119the file is not already loaded.
120 120
121@item :require @var{feature} 121@item :require @var{feature}
122@kindex require@r{, customization keyword} 122@kindex require@r{, customization keyword}
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 403a7404edf..dc45ad88174 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -147,7 +147,8 @@ precisely the file name to load.
147 147
148@deffn Command load-library library 148@deffn Command load-library library
149This command loads the library named @var{library}. It is equivalent to 149This command loads the library named @var{library}. It is equivalent to
150@code{load}, except in how it reads its argument interactively. 150@code{load}, except for the way it reads its argument interactively.
151@xref{Lisp Libraries,,,emacs, The GNU Emacs Manual}.
151@end deffn 152@end deffn
152 153
153@defvar load-in-progress 154@defvar load-in-progress