[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el [rmail-mbox-branch]

[Richard M . Stallman]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.368.2.7 emacs/lisp/mail/rmail.el:1.368.2.8
*** emacs/lisp/mail/rmail.el:1.368.2.7  Mon Sep 27 23:05:55 2004
--- emacs/lisp/mail/rmail.el    Sun Oct  3 01:21:28 2004
***************
*** 598,603 ****
--- 598,606 ----
  
  (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,682 ****
        (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"))
        (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.
--- 677,686 ----
        (setq run-mail-hook t)
        (rmail-mode-2)
        (goto-char (point-min))
!       ;; 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.