aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2000-09-01 21:41:22 +0000
committerEli Zaretskii2000-09-01 21:41:22 +0000
commit778911b922acbca7fe4dae5c025e39141b7145fa (patch)
treefb8c75b7473fc3f68035cbd4a6cfd5baabcbdbe4
parent546c0888f74a19b3079e362eb0fa8f4e17434e2f (diff)
downloademacs-778911b922acbca7fe4dae5c025e39141b7145fa.tar.gz
emacs-778911b922acbca7fe4dae5c025e39141b7145fa.zip
(Info-directory-list): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/info.el16
2 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f5d20ecb40..d422cb057ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-09-02 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * info.el (Info-directory-list): Doc fix.
4
12000-08-31 Peter Breton <pbreton@ne.mediaone.net> 52000-08-31 Peter Breton <pbreton@ne.mediaone.net>
2 6
3 * filecache.el (file-cache-add-directory-using-find): Don't quote 7 * filecache.el (file-cache-add-directory-using-find): Don't quote
diff --git a/lisp/info.el b/lisp/info.el
index eb71449e6c4..cd9f86384bb 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -88,13 +88,19 @@ The Lisp code is executed when the node is selected.")
88nil means not yet initialized. In this case, Info uses the environment 88nil means not yet initialized. In this case, Info uses the environment
89variable INFOPATH to initialize it, or `Info-default-directory-list' 89variable INFOPATH to initialize it, or `Info-default-directory-list'
90if there is no INFOPATH variable in the environment. 90if there is no INFOPATH variable in the environment.
91The last element of `Info-default-directory-list' is the directory 91
92where Emacs installs the Info files that come with it. 92When `Info-directory-list' is initialized from the value of
93`Info-default-directory-list', the first element of the resulting
94list is the directory where Emacs installs the Info files that
95come with it. This is so that Emacs's own manual, which suits the
96version of Emacs you are using, will always be found first. (If
97you want to override that, set INFOPATH in the environment.)
93 98
94If you run the Emacs executable from the `src' directory in the Emacs 99If you run the Emacs executable from the `src' directory in the Emacs
95source tree, the `info' directory in the source tree is used as the last 100source tree, and INFOPATH is not defined, the `info' directory in the
96element, in place of the installation Info directory. This is useful 101source tree is used as the first element of `Info-directory-list', in
97when you run a version of Emacs without installing it.") 102place of the installation Info directory. This is useful when you run
103a version of Emacs without installing it.")
98 104
99(defcustom Info-additional-directory-list nil 105(defcustom Info-additional-directory-list nil
100 "List of additional directories to search for Info documentation files. 106 "List of additional directories to search for Info documentation files.