diff options
| author | Richard M. Stallman | 1999-01-20 03:24:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-01-20 03:24:48 +0000 |
| commit | 37f4b0339c35c09b997482af7d17f37d5e219430 (patch) | |
| tree | 756ad260dc16f967ffb93827b4ea274609e5e587 | |
| parent | fea0d7fa5fab9563313603f3932d5560720d841b (diff) | |
| download | emacs-37f4b0339c35c09b997482af7d17f37d5e219430.tar.gz emacs-37f4b0339c35c09b997482af7d17f37d5e219430.zip | |
(Info-default-directory-list): Perhaps add /usr/info.
| -rw-r--r-- | lisp/paths.el | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lisp/paths.el b/lisp/paths.el index 0f5bd956a29..76c56765d81 100644 --- a/lisp/paths.el +++ b/lisp/paths.el | |||
| @@ -33,16 +33,22 @@ | |||
| 33 | ;;; Code: | 33 | ;;; Code: |
| 34 | 34 | ||
| 35 | (defvar Info-default-directory-list | 35 | (defvar Info-default-directory-list |
| 36 | (let ((start (list "/usr/local/lib/info/" | 36 | (let* ((start (list "/usr/local/lib/info/" |
| 37 | ;; This comes second so that, if it is the same | 37 | ;; This comes second so that, if it is the same |
| 38 | ;; as configure-info-directory (which is usually true) | 38 | ;; as configure-info-directory (which is usually true) |
| 39 | ;; and Emacs has been installed (also usually true) | 39 | ;; and Emacs has been installed (also usually true) |
| 40 | ;; then the list will end with two copies of this; | 40 | ;; then the list will end with two copies of this; |
| 41 | ;; which means that the last dir file Info-insert-dir | 41 | ;; which means that the last dir file Info-insert-dir |
| 42 | ;; finds will be the one in this directory. | 42 | ;; finds will be the one in this directory. |
| 43 | "/usr/local/info/")) | 43 | "/usr/local/info/")) |
| 44 | (configdir (file-name-as-directory configure-info-directory))) | 44 | ;; Typically on a GNU system, installed info files are found |
| 45 | (setq start (nconc start (list configdir))) | 45 | ;; in /usr/info, but the default prefix is /usr/local. |
| 46 | (usrdir "/usr/info") | ||
| 47 | (sysdir (and (file-directory-p usrdir) | ||
| 48 | (not (string= configure-info-directory usrdir)) | ||
| 49 | (list usrdir))) | ||
| 50 | (configdir (file-name-as-directory configure-info-directory))) | ||
| 51 | (setq start (nconc sysdir start (list configdir))) | ||
| 46 | start) | 52 | start) |
| 47 | "Default list of directories to search for Info documentation files. | 53 | "Default list of directories to search for Info documentation files. |
| 48 | They are searched in the order they are given in the list. | 54 | They are searched in the order they are given in the list. |