[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el

[Eli Zaretskii]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.375 emacs/lisp/mail/rmail.el:1.376
*** emacs/lisp/mail/rmail.el:1.375      Thu Oct 16 12:54:48 2003
--- emacs/lisp/mail/rmail.el    Mon Nov  3 14:20:23 2003
***************
*** 1687,1703 ****
                         (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")))
                   (setq last-coding-system-used nil)
                   (or rmail-enable-mime
                       (not rmail-enable-multibyte)
--- 1687,1705 ----
                         (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)))
                   (setq last-coding-system-used nil)
                   (or rmail-enable-mime
                       (not rmail-enable-multibyte)
***************
*** 1827,1839 ****
                       (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"))))
  
               (save-excursion
                 (save-restriction
--- 1829,1843 ----
                       (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
                 (save-restriction