summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-07-15 13:04:12 -0400
committerGlenn Morris <rgm@gnu.org>2011-07-15 13:04:12 -0400
commitbd23ebc01d3a58d3f8357d97f49cf00c2ef4b585 (patch)
tree3739ee0a08ff5cbf05d3befd4f1be942f2f1d2d8
parentdbc44fcd08d1105e2aa4de567d40814f6b668053 (diff)
downloademacs-bd23ebc01d3a58d3f8357d97f49cf00c2ef4b585.tar.gz
* lisp/info.el (info-insert-file-contents): Require jka-compr. (Bug#9090)
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/info.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e15843f136d..307e4df7ae7 100644
--- 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 afe7e858fd7..51105be6db3 100644
--- 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)