[Emacs-diffs] /srv/bzr/emacs/trunk r105240: Rework previous change.

[Glenn Morris]

------------------------------------------------------------
revno: 105240
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-15 13:18:53 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/info.el
  lisp/jka-cmpr-hook.el
  lisp/jka-compr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-15 17:04:12 +0000
+++ b/lisp/ChangeLog    2011-07-15 17:18:53 +0000
@@ -1,6 +1,9 @@
 2011-07-15  Glenn Morris  <address@hidden>
 
-       * 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  <address@hidden>
 

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

=== modified file 'lisp/jka-cmpr-hook.el'
--- a/lisp/jka-cmpr-hook.el     2011-07-14 01:09:00 +0000
+++ b/lisp/jka-cmpr-hook.el     2011-07-15 17:18:53 +0000
@@ -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)
 

=== modified file 'lisp/jka-compr.el'
--- a/lisp/jka-compr.el 2011-07-13 13:25:29 +0000
+++ b/lisp/jka-compr.el 2011-07-15 17:18:53 +0000
@@ -97,11 +97,6 @@
   :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))))