changeset 7754:d02006c4ac42

(Info-default-directory-list): Don't attach ../info. So now configure-info-directory comes last. Put /usr/local/info second.
author Richard M. Stallman <rms@gnu.org>
date Mon, 30 May 1994 11:50:27 +0000
parents 198dd616a588
children 6191acd134b6
files lisp/paths.el
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/paths.el	Mon May 30 11:47:07 1994 +0000
+++ b/lisp/paths.el	Mon May 30 11:50:27 1994 +0000
@@ -32,15 +32,16 @@
 ;;; Code:
 
 (defvar Info-default-directory-list
-  (let ((start (list "/usr/local/info/"
-		     "/usr/local/lib/info/"))
+  (let ((start (list "/usr/local/lib/info/"
+		     ;; This comes second so that, if it is the same
+		     ;; as configure-info-directory (which is usually true)
+		     ;; and Emacs has been installed (also usually true)
+		     ;; then the list will end with two copies of this;
+		     ;; which means that the last dir file Info-insert-dir
+		     ;; finds will be the one in this directory.
+		     "/usr/local/info/"))
 	(configdir (file-name-as-directory configure-info-directory)))
-    (or (member configdir start)
-	(setq start (nconc start (list configdir))))
-    (or (member (expand-file-name "../info/" data-directory) start)
-	(setq start
-	      (nconc start
-		     (list (expand-file-name "../info/" data-directory)))))
+    (setq start (nconc start (list configdir)))
     start)
   "List of directories to search for Info documentation files.
 They are searched in the order they are given in this list.