changeset 35864:3cd2825584a5

(info-initialize): If installation-directory is nil, for DOS/Windows systems try looking in a sibling of invocation-directory.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 02 Feb 2001 18:08:54 +0000
parents 534be6e166a6
children d90b80042f6b
files lisp/info.el
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/info.el	Fri Feb 02 18:06:18 2001 +0000
+++ b/lisp/info.el	Fri Feb 02 18:08:54 2001 +0000
@@ -311,7 +311,19 @@
     (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