# HG changeset patch # User Richard M. Stallman # Date 769387342 0 # Node ID 9439aeb622d7a215a011bb5dd86fbbc101b6bd0e # Parent d0c9af68a5ba04fb80d40c9232a84e608243f550 (info-insert-file-contents): Avoid conflict with jka-compr. diff -r d0c9af68a5ba -r 9439aeb622d7 lisp/info.el --- a/lisp/info.el Thu May 19 22:13:51 1994 +0000 +++ b/lisp/info.el Thu May 19 22:42:22 1994 +0000 @@ -129,6 +129,12 @@ (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))) (insert-file-contents fullname visit)