Synch to No Gnus 200512181440.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47b21dd..05b29c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * nnml.el: Don't require gnus-bcklg.  Autoload it.
+       (nnml-use-compressed-files, nnml-save-mail): Support other
+       comression programs such as bzip2.
+
 2005-12-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * dns.el (query-dns): Make sure we check the buffer size before

diff --git a/lisp/nnml.el b/lisp/nnml.el
index ee64cb8..223a70a 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -39,11 +39,11 @@
 (require 'gnus)
 (require 'nnheader)
 (require 'nnmail)
-(require 'gnus-bcklg)
 (require 'nnoo)
 
 (eval-and-compile
-  (autoload 'gnus-article-unpropagatable-p "gnus-sum"))
+  (autoload 'gnus-article-unpropagatable-p "gnus-sum")
+  (autoload 'gnus-backlog-remove-article "gnus-bcklg"))
 
 (nnoo-declare nnml)
 
@@ -86,7 +86,12 @@ marks file will be regenerated properly by Gnus.")
   "If non-nil, inhibit expiry.")
 
 (defvoo nnml-use-compressed-files nil
-  "If non-nil, allow using compressed message files.")
+  "If non-nil, allow using compressed message files.
+
+If it is a string, use it as the file extension which specifies
+the comression program.  You can set it to \".bz2\" if your Emacs
+supports auto-compression using the bzip2 program.  A value of t
+is equivalent to \".gz\".")
 
 (defvoo nnml-compressed-files-size-threshold 1000
   "Default size threshold for compressed message files.
@@ -632,7 +637,9 @@ non-nil.")
     (setq extension
          (and nnml-use-compressed-files
              (> chars nnml-compressed-files-size-threshold)
-              ".gz"))
+             (if (stringp nnml-use-compressed-files)
+                 nnml-use-compressed-files
+               ".gz")))
     (nnmail-insert-xref group-art)
     (run-hooks 'nnmail-prepare-save-mail-hook)
     (run-hooks 'nnml-prepare-save-mail-hook)