(rmail-convert-to-babyl-format): Make the code

cleaner (suggested by Richard M. Stallman).

1 files changed, 28 insertions, 22 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index acc7e4839d..512712ec4b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1687,19 +1687,22 @@ It returns t if it got any new messages."
 			 (delete-region (point) (search-backward ":"))
 			 (insert ": 8bit")))
 		   (if base64-header-field-end
-		       (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)))
+		       (save-excursion
+			 (when
+			     (condition-case nil
+				 (progn
+				   (base64-decode-region (1+ header-end)
+							 (- (point) 2))
+				   t)
+			       (error nil))
+			   ;; 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"))))
 		   (setq last-coding-system-used nil)
 		   (or rmail-enable-mime
 		       (not rmail-enable-multibyte)
@@ -1829,15 +1832,18 @@ It returns t if it got any new messages."
 		       (delete-region (point) (search-backward ":"))
 		       (insert ": 8bit")))
 		 (if base64-header-field-end
-		     (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
+		       (when
+			   (condition-case nil
+			       (progn
+				 (base64-decode-region header-end (point))
+				 t)
+			     (error nil))
+			 ;; Change "base64" to "8bit", to reflect the
+			 ;; decoding we just did.
+			 (goto-char base64-header-field-end)
+			 (delete-region (point) (search-backward ":"))
+			 (insert ": 8bit")))))
 
 	       (save-excursion
 		 (save-restriction