(rmail-convert-to-babyl-format): Avoid deleting trailing white space

and ensure a final newline.

2 files changed, 16 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ae7ac293d4..745c62829b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-21  Markus Rost  <rost@mathematik.uni-bielefeld.de>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format): Avoid deleting
+        trailing white space and ensure a final newline.
+
+        * mail/rmail-spam-filter.el (rmail-use-spam-filter): Add autoload
+        cookie.
+
 2004-01-21  Benjamin Rutt  <brutt@bloomington.in.us>
 
         * vc.el (vc-annotate-mode): Inherit from fundamental-mode and
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f8abc2a910d..462919d36d4 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1890,7 +1890,13 @@ It returns t if it got any new messages."
                        (when
                            (condition-case nil
                                (progn
-                                 (base64-decode-region (1+ header-end) (point))
+                                 (base64-decode-region
+                                  (1+ header-end)
+                                  (save-excursion
+                                    ;; Prevent base64-decode-region
+                                    ;; from removing newline characters.
+                                    (skip-chars-backward "\n\t ")
+                                    (point)))
                                  t)
                              (error nil))
                          (goto-char header-end)
@@ -1908,6 +1914,7 @@ It returns t if it got any new messages."
                    (goto-char (point-min))
                    (while (search-forward "\n\^_" nil t); single char
                      (replace-match "\n^_")))); 2 chars: "^" and "_"
+               (or (bolp) (newline)) ; in case we lost the final newline.
                (insert ?\^_)
                (setq last-coding-system-used nil)
                (or rmail-enable-mime