aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
12011-07-15 Glenn Morris <rgm@gnu.org>
2
3 * info.el (info-insert-file-contents): Require jka-compr. (Bug#9090)
4
12011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node. 7 * 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 @@
32 32
33;;; Code: 33;;; Code:
34 34
35(eval-when-compile (require 'jka-compr) (require 'cl)) 35(eval-when-compile (require 'cl))
36 36
37(defgroup info nil 37(defgroup info nil
38 "Info subsystem." 38 "Info subsystem."
@@ -463,6 +463,7 @@ be last in the list.")
463(defun info-insert-file-contents (filename &optional visit) 463(defun info-insert-file-contents (filename &optional visit)
464 "Insert the contents of an Info file in the current buffer. 464 "Insert the contents of an Info file in the current buffer.
465Do the right thing if the file has been compressed or zipped." 465Do the right thing if the file has been compressed or zipped."
466 (require 'jka-compr) ; bug #9090
466 (let* ((tail Info-suffix-list) 467 (let* ((tail Info-suffix-list)
467 (jka-compr-verbose nil) 468 (jka-compr-verbose nil)
468 (lfn (if (fboundp 'msdos-long-file-names) 469 (lfn (if (fboundp 'msdos-long-file-names)