(rmail): Convert Babyl files using decode-babyl-file.

(rmail-use-spam-filter): Add defvar.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f6dda2bbc68ff966a4ee32578629794c21510be..74a45d9bfdd0e7b5583f51ebcca9be5e397f3688 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-02  Richard M. Stallman  <rms@gnu.org>
+
+       * mail/rmail.el (rmail): Convert Babyl files using decode-babyl-file.
+       (rmail-use-spam-filter): Add defvar.
+
+       * mail/unrmail.el: Mostly rewritten.  Parses the file
+       directly without calling any functions in Rmail.
+       (batch-convert-babyl, convert-babyl-file, decode-babyl-file)
+       (decode-babyl): New functions.
+       (unrmail, batch-unrmail): Now aliases.
+
 2004-09-27  Richard M. Stallman  <rms@gnu.org>
 
        * mail/rmaildesc.el (rmail-message-deleted-p): Add as alias.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index fe6805c8de6598b22d9fe1ee1641e351de2ff606..bba3f24ccbff3802ce59f526eaddd16b41bc2caa 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -598,6 +598,9 @@ The first parenthesized expression should match the MIME-charset name.")
 
 (defvar rmail-enable-multibyte nil)
 
+;; Avoid errors.
+(defvar rmail-use-spam-filter nil)
+
 ;;; mbox don't care
 (defun rmail-require-mime-maybe ()
   "Require `rmail-mime-feature' if that is non-nil.
@@ -674,9 +677,10 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
       (setq run-mail-hook t)
       (rmail-mode-2)
       (goto-char (point-min))
-      ;; If file starts like a Babyl file, reject it.
-      (if (looking-at "BABYL OPTIONS:")
-         (error "This is a BABYL file; use M-x unrmail to convert it"))
+      ;; If file starts like a Babyl file, convert it.
+      (when (looking-at "BABYL OPTIONS:")
+       (erase-buffer)
+       (decode-babyl-file file-name))
       (goto-char (point-max)))
     ;; As we have read a file by raw-text, the buffer is set to
     ;; unibyte.  We must make it multibyte if necessary.