Commit 0e567160 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(info-insert-file-contents): Avoid conflict with jka-compr.

parent f87bb1ee
...@@ -129,6 +129,12 @@ Do the right thing if the file has been compressed or zipped." ...@@ -129,6 +129,12 @@ Do the right thing if the file has been compressed or zipped."
(setq tail (cdr tail))) (setq tail (cdr tail)))
(setq fullname (concat filename (car (car tail))) (setq fullname (concat filename (car (car tail)))
decoder (cdr (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 (or tail
(error "Can't find %s or any compressed version of it!" filename))) (error "Can't find %s or any compressed version of it!" filename)))
(insert-file-contents fullname visit) (insert-file-contents fullname visit)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment