Mercurial > emacs

changeset 7572:9439aeb622d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(info-insert-file-contents): Avoid conflict with jka-compr.
author Richard M. Stallman <rms@gnu.org>
date Thu, 19 May 1994 22:42:22 +0000
parents d0c9af68a5ba
children 059281285df7
files lisp/info.el
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)