(info-initialize): Use prune-directory-list to remove non-existant

  directories from Info-directory-list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2742992a4fc71c61d02073d1523c2b4c56cf4566..3df176e418a3e111ec5bca8585f793bb0664526d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2000-06-29  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * paths.el (prune-directory-list): New function.
+       (Info-default-directory-list): Rewritten to more methodically
+       enumerate a big list of possible info directories (based on the
+       list used by the standalone info reader).
+       * info.el (info-initialize): Use prune-directory-list to remove
+       non-existant directories from Info-directory-list.
+
+2000-06-27  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * paths.el (Info-default-directory-list): Try a list of possible
+       info-directories instead of a single one.  Add the possible
+       info directory "/usr/share/info".
+
+       * woman.el (woman-man.conf-path): Explicitly include the debian
+       man-db config file "/etc/manpath.config".
+       (woman-parse-man.conf): Also handle MANDATORY_MANPATH entries, as
+       are present in `manpath.config'.
+       (woman-manpath): Include "/usr/share/man".
+
 2000-07-03  Gerd Moellmann  <gerd@gnu.org>
 
        * frame.el (blink-cursor-mode): Don't hide cursor initially.

diff --git a/lisp/info.el b/lisp/info.el
index 78c2193f005243b861d913ef976b768b105b0d85..2f5d67444961769702f6eb48905f3fa61557e5c2 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -259,30 +259,31 @@ Do the right thing if the file has been compressed or zipped."
                       (expand-file-name "info/" installation-directory)))
          alternative)
       (setq Info-directory-list
-           (if path
-               (split-string path (regexp-quote path-separator))
-             (if (and sibling (file-exists-p sibling))
-                 ;; Uninstalled, Emacs builddir != srcdir.
-                 (setq alternative sibling)
-               ;; Uninstalled, builddir == srcdir
-               (setq alternative source))
-             (if (or (member alternative Info-default-directory-list)
-                     ;; 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))
-                         nil
-                       ;; Use invocation-directory for Info
-                       ;; only if we used it for exec-directory also.
-                       (not (string= exec-directory
-                                     (expand-file-name "lib-src/"
-                                                       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'
-               ;; currently expects to find `alternative' first on the list.
-               (cons alternative
-                     (reverse (cdr (reverse Info-default-directory-list))))))))))
+           (prune-directory-list
+            (if path
+                (split-string path (regexp-quote path-separator))
+              (if (and sibling (file-exists-p sibling))
+                  ;; Uninstalled, Emacs builddir != srcdir.
+                  (setq alternative sibling)
+                ;; Uninstalled, builddir == srcdir
+                (setq alternative source))
+              (if (or (member alternative Info-default-directory-list)
+                      ;; 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))
+                          nil
+                        ;; Use invocation-directory for Info
+                        ;; only if we used it for exec-directory also.
+                        (not (string= exec-directory
+                                      (expand-file-name "lib-src/"
+                                                        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'
+                ;; currently expects to find `alternative' first on the list.
+                (cons alternative
+                      (reverse (cdr (reverse Info-default-directory-list)))))))))))
 
 ;;;###autoload
 (defun info-other-window (&optional file)