From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 2 Feb 2001 18:10:41 +0000 (+0000)
Subject: (info-initialize): If installation-directory is nil, for
X-Git-Tag: emacs-pretest-21.0.98~190
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c366083cd0d072cbd3afca41aa93adadcd9eee9;p=emacs.git

(info-initialize): If installation-directory is nil, for
DOS/Windows systems try looking in a sibling of
invocation-directory.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcff096af9d..7a7547eb8d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/info.el b/lisp/info.el
index dc9a7b7dea9..1add6ed522f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -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