Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
78e7e8a0
Commit
78e7e8a0
authored
Jul 04, 2000
by
Miles Bader
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(info-initialize): Use prune-directory-list to remove non-existant
directories from Info-directory-list.
parent
97ad35dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
24 deletions
+46
-24
lisp/ChangeLog
lisp/ChangeLog
+21
-0
lisp/info.el
lisp/info.el
+25
-24
No files found.
lisp/ChangeLog
View file @
78e7e8a0
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.
...
...
lisp/info.el
View file @
78e7e8a0
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment