(Info-default-directory-list): Don't attach ../info.

So now configure-info-directory comes last.
Put /usr/local/info second.

diff --git a/lisp/paths.el b/lisp/paths.el
index 3cf574352ba407f756fc6946fda4f405ceaf09d5..9682cb1933742c8218f8054e3d17142279c4e7ef 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -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.