(rmail-convert-file): Exclude the Babyl header

when calling rmail-convert-to-babyl-format.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d55627ee0a66b6f7c6c96b501b7d45e3c89da5a2..979975bafa023ad95932e1a84cdbcb46f2da8a86 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -276,14 +276,19 @@ that file, but does not copy any new mail into the file."
     ;; Unix format messages added at the end,
     ;; convert file as necessary.
     (if (or convert
-           (progn (goto-char (point-max))
-                  (search-backward "\^_")
-                  (forward-char 1)
-                  (looking-at "\n*From ")))
+           (save-excursion
+             (goto-char (point-max))
+             (search-backward "\^_")
+             (forward-char 1)
+             (looking-at "\n*From ")))
        (let ((buffer-read-only nil))
          (message "Converting to Babyl format...")
-;;; If file needs conversion, convert it all.
+         ;; If file needs conversion, convert it all,
+         ;; except for the BABYL header.
+         ;; (rmail-convert-to-babyl-format would delete the header.)
 ;;;      (narrow-to-region (point) (point-max))
+         (goto-char (point-min))
+         (search-forward "\n\^_" nil t)
          (rmail-convert-to-babyl-format)
          (message "Converting to Babyl format...done")))))