* lisp/info.el (info-insert-file-contents): Require jka-compr. (Bug#9090)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e15843f136d67a6ac1e41001077a882818c57bd5..307e4df7ae71b40e76bc440c4a277880872e0c2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-15  Glenn Morris  <rgm@gnu.org>
+
+       * info.el (info-insert-file-contents): Require jka-compr.  (Bug#9090)
+
 2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node.

diff --git a/lisp/info.el b/lisp/info.el
index afe7e858fd7bc685171a7909f3f63fb2a6cf20b0..51105be6db3d56a50f632ddce15120ea18dfcd53 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -32,7 +32,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'jka-compr) (require 'cl))
+(eval-when-compile (require 'cl))
 
 (defgroup info nil
   "Info subsystem."
@@ -463,6 +463,7 @@ be last in the list.")
 (defun info-insert-file-contents (filename &optional visit)
   "Insert the contents of an Info file in the current buffer.
 Do the right thing if the file has been compressed or zipped."
+  (require 'jka-compr)                 ; bug #9090
   (let* ((tail Info-suffix-list)
         (jka-compr-verbose nil)
         (lfn (if (fboundp 'msdos-long-file-names)