diff options
| author | Eli Zaretskii | 2000-12-14 17:14:32 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2000-12-14 17:14:32 +0000 |
| commit | 4dddb0b795e961580f2cd63d2481bf75e8896b3d (patch) | |
| tree | 55d71c169ff812cfff5ba8c7187a09739e954375 | |
| parent | e103ef954c471b7b0a40c8b82598bbc364d28655 (diff) | |
| download | emacs-4dddb0b795e961580f2cd63d2481bf75e8896b3d.tar.gz emacs-4dddb0b795e961580f2cd63d2481bf75e8896b3d.zip | |
(Info-directory-list): Change doc string to reflect the
change in Info-default-directory-list.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/info.el | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22605feaad3..9385652c869 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | 2000-12-14 Eli Zaretskii <eliz@is.elta.co.il> | 1 | 2000-12-14 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 2 | ||
| 3 | * paths.el (Info-default-directory-list): If | ||
| 4 | configure-info-directory is not one of the standard directories, | ||
| 5 | put it first in the list; otherwise put it last. Doc string | ||
| 6 | changed accordingly. | ||
| 7 | |||
| 8 | * info.el (Info-directory-list): Change doc string to reflect the | ||
| 9 | change in Info-default-directory-list. | ||
| 10 | |||
| 3 | * simple.el (delete-key-deletes-forward-mode): Treat ms-dos and | 11 | * simple.el (delete-key-deletes-forward-mode): Treat ms-dos and |
| 4 | windows-nt as windowed environments, even under -nw. | 12 | windows-nt as windowed environments, even under -nw. |
| 5 | 13 | ||
diff --git a/lisp/info.el b/lisp/info.el index da25668b684..3b2e675f7f1 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -108,11 +108,21 @@ variable INFOPATH to initialize it, or `Info-default-directory-list' | |||
| 108 | if there is no INFOPATH variable in the environment. | 108 | if there is no INFOPATH variable in the environment. |
| 109 | 109 | ||
| 110 | When `Info-directory-list' is initialized from the value of | 110 | When `Info-directory-list' is initialized from the value of |
| 111 | `Info-default-directory-list', the first element of the resulting | 111 | `Info-default-directory-list', and Emacs is installed in one of the |
| 112 | standard directories, the directory of Info files that come with Emacs | ||
| 113 | is put last (so that local Info files override standard ones). | ||
| 114 | |||
| 115 | When `Info-directory-list' is initialized from the value of | ||
| 116 | `Info-default-directory-list', and Emacs is not installed in one | ||
| 117 | of the standard directories, the first element of the resulting | ||
| 112 | list is the directory where Emacs installs the Info files that | 118 | list is the directory where Emacs installs the Info files that |
| 113 | come with it. This is so that Emacs's own manual, which suits the | 119 | come with it. This is so that Emacs's own manual, which suits the |
| 114 | version of Emacs you are using, will always be found first. (If | 120 | version of Emacs you are using, will always be found first. This |
| 115 | you want to override that, set INFOPATH in the environment.) | 121 | is useful when you install an experimental version of Emacs without |
| 122 | removing the standard installation. | ||
| 123 | |||
| 124 | If you want to override the order of directories in | ||
| 125 | `Info-default-directory-list', set INFOPATH in the environment. | ||
| 116 | 126 | ||
| 117 | If you run the Emacs executable from the `src' directory in the Emacs | 127 | If you run the Emacs executable from the `src' directory in the Emacs |
| 118 | source tree, and INFOPATH is not defined, the `info' directory in the | 128 | source tree, and INFOPATH is not defined, the `info' directory in the |