(rmail-convert-to-babyl-format): If

base64-decode-region signals an error, catch it and silently
ignore it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d1c23dfa0a5b890f9469e532fdb601c5a966041..4585f520ae5ce4a7bdb8154ec36ef4b5ff9ece7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-03  Eli Zaretskii  <eliz@elta.co.il>
+
+       * mail/rmail.el (rmail-convert-to-babyl-format): If
+       base64-decode-region signals an error, catch it and silently
+       ignore it.
+
 2003-11-01  Mark A. Hershberger  <mah@everybody.org>
 
        * xml.el: Allow comments following the top-level element.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 009050b1fbd21cc7a19b61ace925bcbd91ae9009..acc7e4839ddb0b04a354be449501779a45325b88 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1687,17 +1687,19 @@ It returns t if it got any new messages."
                         (delete-region (point) (search-backward ":"))
                         (insert ": 8bit")))
                   (if base64-header-field-end
-                      (save-excursion
-                        (base64-decode-region (1+ header-end)
-                                              (- (point) 2))
-                        ;; Change "base64" to "8bit", to reflect the
-                        ;; decoding we just did.
-                        (goto-char (1+ header-end))
-                        (while (search-forward "\r\n" (point-max) t)
-                          (replace-match "\n"))
-                        (goto-char base64-header-field-end)
-                        (delete-region (point) (search-backward ":"))
-                        (insert ": 8bit")))
+                      (condition-case nil
+                          (save-excursion
+                            (base64-decode-region (1+ header-end)
+                                                  (- (point) 2))
+                            ;; Change "base64" to "8bit", to reflect the
+                            ;; decoding we just did.
+                            (goto-char (1+ header-end))
+                            (while (search-forward "\r\n" (point-max) t)
+                              (replace-match "\n"))
+                            (goto-char base64-header-field-end)
+                            (delete-region (point) (search-backward ":"))
+                            (insert ": 8bit"))
+                        (error nil)))
                   (setq last-coding-system-used nil)
                   (or rmail-enable-mime
                       (not rmail-enable-multibyte)
@@ -1827,13 +1829,15 @@ It returns t if it got any new messages."
                       (delete-region (point) (search-backward ":"))
                       (insert ": 8bit")))
                 (if base64-header-field-end
-                    (save-excursion
-                      (base64-decode-region header-end (point))
-                      ;; Change "base64" to "8bit", to reflect the
-                      ;; decoding we just did.
-                      (goto-char base64-header-field-end)
-                      (delete-region (point) (search-backward ":"))
-                      (insert ": 8bit"))))
+                    (condition-case nil
+                        (save-excursion
+                          (base64-decode-region header-end (point))
+                          ;; Change "base64" to "8bit", to reflect the
+                          ;; decoding we just did.
+                          (goto-char base64-header-field-end)
+                          (delete-region (point) (search-backward ":"))
+                          (insert ": 8bit"))
+                      (error nil))))
 
               (save-excursion
                 (save-restriction