diff options
| author | Richard M. Stallman <[email protected]> | 1995-05-09 05:36:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 1995-05-09 05:36:55 +0000 |
| commit | 0e7f9b35bb3038117c28879ebb48b6217a0eb08f (patch) | |
| tree | 384a12f94e0d4c4ac79db76c228396cdb917e802 /lisp/info.el | |
| parent | 60558b198d60d4baefa0dfd17da153536ac97854 (diff) | |
(Info-directory-list): Use installation-directory,
not invocation-directory. Cope if it is nil.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/info.el b/lisp/info.el index 77973c9e36..3972e16ab9 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -58,7 +58,8 @@ in paths.el.") (sep (if (or (eq system-type 'ms-dos) (eq system-type 'windows-nt)) ";" ":")) - (sibling (expand-file-name "../info/" (invocation-directory)))) + (sibling (if installation-directory + (expand-file-name "info/" installation-directory)))) (if path (let ((list nil) idx) @@ -68,7 +69,8 @@ in paths.el.") path (substring path (min (1+ idx) (length path))))) (nreverse list)) - (if (or (member sibling Info-default-directory-list) + (if (or (null sibling) + (member sibling Info-default-directory-list) (not (file-exists-p sibling)) ;; On DOS/NT, we use movable executables always, ;; and we must always find the Info dir at run time. @@ -77,8 +79,8 @@ in paths.el.") ;; Use invocation-directory for Info only if we used it for ;; exec-directory also. (not (string= exec-directory - (expand-file-name "../lib-src/" - (invocation-directory)))))) + (expand-file-name "lib-src/" + installation-directory))))) Info-default-directory-list (reverse (cons sibling (cdr (reverse Info-default-directory-list))))))) "List of directories to search for Info documentation files. |