Mercurial > emacs
changeset 9588:7d465ccfd45b
(info-insert-file-contents): Always check for conflict with jka-compr.
(Info-find-node): Don't search on Info-directory-list if the
file name is absolute.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 18 Oct 1994 05:25:40 +0000 |
| parents | 4d94983ab156 |
| children | 2bee58e79145 |
| files | lisp/info.el |
| diffstat | 1 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/info.el Tue Oct 18 05:22:27 1994 +0000 +++ b/lisp/info.el Tue Oct 18 05:25:40 1994 +0000 @@ -153,14 +153,13 @@ (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 @@ ;; 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)))