From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 9 May 1995 05:36:55 +0000 (+0000)
Subject: (Info-directory-list): Use installation-directory,
X-Git-Tag: emacs-19.34~4077
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e7f9b35bb3038117c28879ebb48b6217a0eb08f;p=emacs.git

(Info-directory-list): Use installation-directory,
not invocation-directory.  Cope if it is nil.
---

diff --git a/lisp/info.el b/lisp/info.el
index 77973c9e369..3972e16ab90 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.