mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-15 17:00:26 +00:00
Code Issues Releases Activity

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

Browse Source 
directories from Info-directory-list.
This commit is contained in:
Miles Bader 2000-07-04 04:50:20 +00:00
parent 97ad35dd11
commit 78e7e8a045
2 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lisp/ChangeLog
View File

@ -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> 2000-07-03 Gerd Moellmann <gerd@gnu.org>
* frame.el (blink-cursor-mode): Don't hide cursor initially. * frame.el (blink-cursor-mode): Don't hide cursor initially.

49
lisp/info.el
View File

@ -259,30 +259,31 @@ Do the right thing if the file has been compressed or zipped."
(expand-file-name "info/" installation-directory))) (expand-file-name "info/" installation-directory)))
alternative) alternative)
(setq Info-directory-list (setq Info-directory-list
(if path (prune-directory-list
(split-string path (regexp-quote path-separator)) (if path
(if (and sibling (file-exists-p sibling)) (split-string path (regexp-quote path-separator))
;; Uninstalled, Emacs builddir != srcdir. (if (and sibling (file-exists-p sibling))
(setq alternative sibling) ;; Uninstalled, Emacs builddir != srcdir.
;; Uninstalled, builddir == srcdir (setq alternative sibling)
(setq alternative source)) ;; Uninstalled, builddir == srcdir
(if (or (member alternative Info-default-directory-list) (setq alternative source))
;; On DOS/NT, we use movable executables always, (if (or (member alternative Info-default-directory-list)
;; and we must always find the Info dir at run time. ;; On DOS/NT, we use movable executables always,
(if (memq system-type '(ms-dos windows-nt)) ;; and we must always find the Info dir at run time.
nil (if (memq system-type '(ms-dos windows-nt))
;; Use invocation-directory for Info nil
;; only if we used it for exec-directory also. ;; Use invocation-directory for Info
(not (string= exec-directory ;; only if we used it for exec-directory also.
(expand-file-name "lib-src/" (not (string= exec-directory
installation-directory)))) (expand-file-name "lib-src/"
(not (file-exists-p alternative))) installation-directory))))
Info-default-directory-list (not (file-exists-p alternative)))
;; `alternative' contains the Info files that came with this Info-default-directory-list
;; version, so we should look there first. `Info-insert-dir' ;; `alternative' contains the Info files that came with this
;; currently expects to find `alternative' first on the list. ;; version, so we should look there first. `Info-insert-dir'
(cons alternative ;; currently expects to find `alternative' first on the list.
(reverse (cdr (reverse Info-default-directory-list)))))))))) (cons alternative
(reverse (cdr (reverse Info-default-directory-list)))))))))))
;;;###autoload ;;;###autoload
(defun info-other-window (&optional file) (defun info-other-window (&optional file)