(rmail-convert-to-babyl-format): Fix off-by-one

error in arguments to base64-decode-region.  Remove ^M characters
after decoding base64.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6ce9bbf71c..97539c809ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format): Fix off-by-one
+        error in arguments to base64-decode-region.  Remove ^M characters
+        after decoding base64.
+
 2003-12-30  Simon Josefsson  <jas@extundo.com>
 
         * textmodes/texinfo.el: Change maintainer to FSF.  Suggested by
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 512712ec4bc..6185fd12286 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1836,9 +1836,12 @@ It returns t if it got any new messages."
                        (when
                            (condition-case nil
                                (progn
-                                 (base64-decode-region header-end (point))
+                                 (base64-decode-region (1+ header-end) (point))
                                  t)
                              (error nil))
+                         (goto-char header-end)
+                         (while (search-forward "\r\n" (point-max) t)
+                           (replace-match "\n"))
                          ;; Change "base64" to "8bit", to reflect the
                          ;; decoding we just did.
                          (goto-char base64-header-field-end)