From 3f72b4998ba8110cd15f08448ebab3dd3b4a9935 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 3 Jan 1998 05:53:51 +0000
Subject: [PATCH] Change how info-directory-list is initialized so that it
 always includes the distribution's directory.

---
 v7/src/edwin/info.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/v7/src/edwin/info.scm b/v7/src/edwin/info.scm
index cfb0aa3bc..4b765cb68 100644
--- a/v7/src/edwin/info.scm
+++ b/v7/src/edwin/info.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: info.scm,v 1.126 1998/01/03 05:02:13 cph Exp $
+;;;	$Id: info.scm,v 1.127 1998/01/03 05:53:51 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-98 Massachusetts Institute of Technology
 ;;;
@@ -889,22 +889,22 @@ The name may be an abbreviation of the reference name."
 	 (let ((directories (variable-local-value buffer variable)))
 	   (if (null? directories)
 	       (let ((directories
-		      (cond ((ref-variable info-directory buffer)
-			     => (lambda (directory)
-				  (list (->namestring directory))))
-			    ((get-environment-variable "INFOPATH")
-			     => os/parse-path-string)
-			    (else
-			     (let ((dirs
+		      (let ((directories
+			     (cond ((ref-variable info-directory buffer)
+				    => list)
+				   ((get-environment-variable "INFOPATH")
+				    => os/parse-path-string)
+				   (else
 				    (ref-variable info-default-directory-list
-						  buffer))
-				   (info-dir (edwin-info-directory)))
-			       (map ->namestring
-				    (if (there-exists? dirs
-					  (lambda (dir)
-					    (pathname=? info-dir dir)))
-					dirs
-					(append dirs (list info-dir)))))))))
+						  buffer))))
+			    (info-dir (edwin-info-directory)))
+			(map ->namestring
+			     (if (and (file-directory? info-dir)
+				      (not (there-exists? directories
+					     (lambda (dir)
+					       (pathname=? info-dir dir)))))
+				 (append directories (list info-dir))
+				 directories)))))
 		 (set-variable-local-value! buffer variable directories)
 		 directories)
 	       directories)))))
-- 
2.25.1