[Emacs-diffs] /srv/bzr/emacs/trunk r105239: * lisp/info.el (info-insert-file-contents): Require jka-compr. (Bug#9090)

[Glenn Morris]

------------------------------------------------------------
revno: 105239
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-15 13:04:12 -0400
message:
  * lisp/info.el (info-insert-file-contents): Require jka-compr.  (Bug#9090)
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-15 16:01:18 +0000
+++ b/lisp/ChangeLog    2011-07-15 17:04:12 +0000
@@ -1,3 +1,7 @@
+2011-07-15  Glenn Morris  <address@hidden>
+
+       * info.el (info-insert-file-contents): Require jka-compr.  (Bug#9090)
+
 2011-07-15  Lars Magne Ingebrigtsen  <address@hidden>
 
        * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node.

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2011-07-15 15:14:46 +0000
+++ b/lisp/info.el      2011-07-15 17:04:12 +0000
@@ -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 @@
 (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)