mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Rework previous change.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2011-07-15 13:18:53 -04:00
parent bd23ebc01d
commit c65bca6520
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,6 +1,9 @@
2011-07-15 Glenn Morris <rgm@gnu.org> 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> 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org>

1
lisp/info.el
View file

@ -463,7 +463,6 @@ be last in the list.")
(defun info-insert-file-contents (filename &optional visit) (defun info-insert-file-contents (filename &optional visit)
"Insert the contents of an Info file in the current buffer. "Insert the contents of an Info file in the current buffer.
Do the right thing if the file has been compressed or zipped." Do the right thing if the file has been compressed or zipped."
(require 'jka-compr) ; bug #9090
(let* ((tail Info-suffix-list) (let* ((tail Info-suffix-list)
(jka-compr-verbose nil) (jka-compr-verbose nil)
(lfn (if (fboundp 'msdos-long-file-names) (lfn (if (fboundp 'msdos-long-file-names)

6
lisp/jka-cmpr-hook.el
View file

@ -39,6 +39,12 @@
"jka-compr customization." "jka-compr customization."
:group 'compression) :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. ;; List of all the elements we actually added to file-coding-system-alist.
(defvar jka-compr-added-to-file-coding-system-alist nil) (defvar jka-compr-added-to-file-coding-system-alist nil)

5
lisp/jka-compr.el
View file

@ -97,11 +97,6 @@ NOTE: Not used in MS-DOS and Windows systems."
:type 'string :type 'string
:group 'jka-compr) :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 (defvar jka-compr-use-shell
(not (memq system-type '(ms-dos windows-nt)))) (not (memq system-type '(ms-dos windows-nt))))