# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 782457940 0
# Node ID 7d465ccfd45baf8d2b09ab65c31e8e2fc82125a2
# Parent  4d94983ab1560cd652232313a820c219ea940f87
(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.

diff -r 4d94983ab156 -r 7d465ccfd45b lisp/info.el
--- 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)))