From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 May 1994 22:42:22 +0000 (+0000)
Subject: (info-insert-file-contents): Avoid conflict with jka-compr.
X-Git-Tag: emacs-19.34~8281
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e5671606ff576f8bfede04d8dfff101b782a8cb;p=emacs.git

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

diff --git a/lisp/info.el b/lisp/info.el
index cb517c9bb3a..be58d065049 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -129,6 +129,12 @@ 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)))
     (insert-file-contents fullname visit)