# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 976813959 0
# Node ID 6620d0fff158ef9a218ea9475236549f218f6736
# Parent  039ec44586cbaa16946d4e94ea6e5420967700b7
(Info-default-directory-list): If
configure-info-directory is not one of the standard directories,
put it first in the list; otherwise put it last.  Doc string
changed accordingly.

diff -r 039ec44586cb -r 6620d0fff158 lisp/paths.el
--- a/lisp/paths.el	Thu Dec 14 16:53:25 2000 +0000
+++ b/lisp/paths.el	Thu Dec 14 17:12:39 2000 +0000
@@ -52,8 +52,10 @@
 		    dirs)))
 
 (defvar Info-default-directory-list
-  (let* ((config
-	  (list (file-name-as-directory configure-info-directory)))
+  (let* ((config-dir
+	  (file-name-as-directory configure-info-directory))
+	 (config
+	  (list config-dir))
 	 (unpruned-prefixes
 	  ;; Directory trees that may not exist at installation time, and
 	  ;; so shouldn't be pruned based on existance.
@@ -66,22 +68,32 @@
 	  ;; Subdirectories in each directory tree that may contain info
 	  ;; directories.
 	  '("" "share/" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
-	    "emacs/" "lib/" "lib/emacs/")))
-    (nconc
-     (apply #'nconc
-	    (mapcar (lambda (pfx)
-		      (let ((dirs
-			     (mapcar (lambda (sfx) (concat pfx sfx "info/"))
-				     suffixes)))
-			(if (member pfx unpruned-prefixes)
-			    dirs
-			  (prune-directory-list dirs config))))
-		    prefixes))
-     config))
+	    "emacs/" "lib/" "lib/emacs/"))
+	 (standard-info-dirs
+	  (apply #'nconc
+		 (mapcar (lambda (pfx)
+			   (let ((dirs
+				  (mapcar (lambda (sfx)
+					    (concat pfx sfx "info/"))
+					  suffixes)))
+			     (if (member pfx unpruned-prefixes)
+				 dirs
+			       (prune-directory-list dirs config))))
+			 prefixes))))
+    ;; If $(prefix)/info is not one of the standard info directories,
+    ;; they are probably installing an experimental version of Emacs,
+    ;; so make sure that experimental version's Info files override
+    ;; the ones in standard directories.
+    (if (member config-dir standard-info-dirs)
+	(nconc (delete config-dir standard-info-dirs) config)
+      (cons config-dir standard-info-dirs)))
   "Default list of directories to search for Info documentation files.
 They are searched in the order they are given in the list.
 Therefore, the directory of Info files that come with Emacs
-normally should come last (so that local files override standard ones).
+normally should come last (so that local files override standard ones),
+unless Emacs is installed into a non-standard directory.  In the latter
+case, the directory of Info files that come with Emacs should be
+first in this list.
 
 Once Info is started, the list of directories to search
 comes from the variable `Info-directory-list'.