Mercurial > emacs

changeset 88152:10939b98d269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(rmail): Convert Babyl files using decode-babyl-file. (rmail-use-spam-filter): Add defvar.
author Richard M. Stallman <rms@gnu.org>
date Sun, 03 Oct 2004 01:21:28 +0000
parents ef41980f1588
children f4d9fc1b0922
files lisp/mail/rmail.el
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mail/rmail.el	Sun Oct 03 01:20:20 2004 +0000
+++ b/lisp/mail/rmail.el	Sun Oct 03 01:21:28 2004 +0000
@@ -598,6 +598,9 @@
 
 (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 @@
       (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.