(info-initialize): If installation-directory is nil, for

DOS/Windows systems try looking in a sibling of
invocation-directory.
This commit is contained in:
Eli Zaretskii 2001-02-02 18:10:41 +00:00
parent 0969bd6a67
commit 2c366083cd
2 changed files with 19 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2001-02-02 Eli Zaretskii <eliz@is.elta.co.il>
* info.el (info-initialize): If installation-directory is nil, for
DOS/Windows systems try looking in a sibling of
invocation-directory.
2001-02-02 Gerd Moellmann <gerd@gnu.org>
* wid-edit.el (widget-button-click): Fix last change.

View file

@ -311,7 +311,19 @@ Do the right thing if the file has been compressed or zipped."
(let ((path (getenv "INFOPATH"))
(source (expand-file-name "info/" source-directory))
(sibling (if installation-directory
(expand-file-name "info/" installation-directory)))
(expand-file-name "info/" installation-directory)
(if (and (memq system-type '(ms-dos windows-nt))
invocation-directory)
(let ((infodir (expand-file-name
"../info/"
invocation-directory)))
(if (file-exists-p infodir)
infodir
(setq infodir (expand-file-name
"../../../info/"
invocation-directory))
(and (file-exists-p infodir)
infodir))))))
alternative)
(setq Info-directory-list
(prune-directory-list