diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-07-15 13:18:53 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-07-15 13:18:53 -0400 |
| commit | c65bca6520d8f3097b1c597381150fd2ffd0f886 (patch) | |
| tree | 322e1b71ebaa0891852dce52dc0de718956317db | |
| parent | bd23ebc01d3a58d3f8357d97f49cf00c2ef4b585 (diff) | |
| download | emacs-c65bca6520d8f3097b1c597381150fd2ffd0f886.tar.gz | |
Rework previous change.
* lisp/jka-compr.el (jka-compr-verbose): Move from here...
* lisp/jka-cmpr-hook.el (jka-compr-verbose): ... to here. (Bug#9090)
Add missing :version tag.
* lisp/info.el: No need to require jka-compr when compiling.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info.el | 1 | ||||
| -rw-r--r-- | lisp/jka-cmpr-hook.el | 6 | ||||
| -rw-r--r-- | lisp/jka-compr.el | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 307e4df7ae7..f99f2692bad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,9 @@ 2011-07-15 Glenn Morris <rgm@gnu.org> - * info.el (info-insert-file-contents): Require jka-compr. (Bug#9090) + * jka-compr.el (jka-compr-verbose): Move from here... + * jka-cmpr-hook.el (jka-compr-verbose): ... to here. (Bug#9090) + Add missing :version tag. + * info.el: No need to require jka-compr when compiling. 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/info.el b/lisp/info.el index 51105be6db3..a4826ee8c2c 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -463,7 +463,6 @@ 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) diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index e1cf2a661ed..d28fde0b214 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -39,6 +39,12 @@ "jka-compr customization." :group 'compression) +(defcustom jka-compr-verbose t + "If non-nil, output messages whenever compressing or uncompressing files." + :version "24.1" + :type 'boolean + :group 'jka-compr) + ;; List of all the elements we actually added to file-coding-system-alist. (defvar jka-compr-added-to-file-coding-system-alist nil) diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 1893e982bbb..cd769885cc6 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -97,11 +97,6 @@ NOTE: Not used in MS-DOS and Windows systems." :type 'string :group 'jka-compr) -(defcustom jka-compr-verbose t - "If non-nil, output messages whenever compressing or uncompressing files." - :type 'boolean - :group 'jka-compr) - (defvar jka-compr-use-shell (not (memq system-type '(ms-dos windows-nt)))) |