From: Phillip Rulon <pjr@gnu.org>
Date: Fri, 24 Sep 1999 13:58:46 +0000 (+0000)
Subject: (info-initialize): Don't test existence of ALTERNATIVE
X-Git-Tag: emacs-pretest-21.0.90~6631
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9eb535910f1a840c4b21dcaf5b990b6eb6374501;p=emacs.git

(info-initialize): Don't test existence of ALTERNATIVE
if we know for some other reason it should not be used.
---

diff --git a/lisp/info.el b/lisp/info.el
index 94c71c2f841..29d8e1e9fa3 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -256,7 +256,6 @@ Do the right thing if the file has been compressed or zipped."
 		;; Uninstalled, builddir == srcdir
 		(setq alternative source))
 	      (if (or (member alternative Info-default-directory-list)
-		      (not (file-exists-p alternative))
 		      ;; On DOS/NT, we use movable executables always,
 		      ;; and we must always find the Info dir at run time.
 		      (if (memq system-type '(ms-dos windows-nt))
@@ -265,7 +264,8 @@ Do the right thing if the file has been compressed or zipped."
 			;; only if we used it for exec-directory also.
 			(not (string= exec-directory
 				      (expand-file-name "lib-src/"
-							installation-directory)))))
+							installation-directory))))
+		      (not (file-exists-p alternative)))
 		  Info-default-directory-list
 		;; `alternative' contains the Info files that came with this
 		;; version, so we should look there first.  `Info-insert-dir'