mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

(info-insert-file-contents): Always check for conflict with jka-compr.

Browse Source 
(Info-find-node): Don't search on Info-directory-list if the
file name is absolute.
This commit is contained in:
Richard M. Stallman 1994-10-18 05:25:40 +00:00
parent b6c96aa028
commit e175bda252
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lisp/info.el
View File

@ -153,14 +153,13 @@ Do the right thing if the file has been compressed or zipped."
(setq tail (cdr tail)))
(setq fullname (concat filename (car (car tail)))
decoder (cdr (car tail)))
;; check for conflict with jka-compr
(if (and (featurep 'jka-compr)
(jka-compr-installed-p)
(jka-compr-get-compression-info (concat filename
(car (car tail)))))
(setq decoder nil))
(or tail
(error "Can't find %s or any compressed version of it!" filename)))
;; check for conflict with jka-compr
(if (and (featurep 'jka-compr)
(jka-compr-installed-p)
(jka-compr-get-compression-info fullname))
(setq decoder nil))
(insert-file-contents fullname visit)
(if decoder
(let ((buffer-read-only nil))
@ -215,10 +214,14 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
;; If specified name starts with `./'
;; then just try current directory.
'("./")
(if Info-additional-directory-list
(append Info-directory-list
Info-additional-directory-list)
Info-directory-list))))
(if (file-name-absolute-p filename)
;; No point in searching for an
;; absolute file name
'(nil)
(if Info-additional-directory-list
(append Info-directory-list
Info-additional-directory-list)
Info-directory-list)))))
;; Search the directory list for file FILENAME.
(while (and dirs (not found))
(setq temp (expand-file-name filename (car dirs)))