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

[Miles Bader]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.360.2.2 emacs/lisp/mail/rmail.el:1.360.2.3
*** emacs/lisp/mail/rmail.el:1.360.2.2  Tue Oct 14 19:39:25 2003
--- emacs/lisp/mail/rmail.el    Thu Nov 20 19:36:08 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)
***************
*** 1727,1733 ****
                     (insert "X-Coding-System: "
                             (symbol-name last-coding-system-used)
                             "\n")))
!              (narrow-to-region (point) (point-max)))
              ;;*** MMDF format
              ((let ((case-fold-search t))
                 (looking-at rmail-mmdf-delim1))
--- 1729,1737 ----
                     (insert "X-Coding-System: "
                             (symbol-name last-coding-system-used)
                             "\n")))
!              (narrow-to-region (point) (point-max))
!              (and (= 0 (% count 10))
!                   (message "Converting to Babyl format...%d" count)))
              ;;*** MMDF format
              ((let ((case-fold-search t))
                 (looking-at rmail-mmdf-delim1))
***************
*** 1752,1758 ****
                         (symbol-name last-coding-system-used)
                         "\n"))
               (narrow-to-region (point) (point-max))
!              (setq count (1+ count)))
              ;;*** Mail format
              ((looking-at "^From ")
               (insert "\^L\n0, unseen,,\n*** EOOH ***\n")
--- 1756,1764 ----
                         (symbol-name last-coding-system-used)
                         "\n"))
               (narrow-to-region (point) (point-max))
!              (setq count (1+ count))
!              (and (= 0 (% count 10))
!                   (message "Converting to Babyl format...%d" count)))
              ;;*** Mail format
              ((looking-at "^From ")
               (insert "\^L\n0, unseen,,\n*** EOOH ***\n")
***************
*** 1823,1835 ****
                       (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
***************
*** 1858,1864 ****
                 (insert "X-Coding-System: "
                         (symbol-name last-coding-system-used)
                         "\n"))
!              (narrow-to-region (point) (point-max)))
              ;;
              ;; This kludge is because some versions of sendmail.el
              ;; insert an extra newline at the beginning that shouldn't
--- 1866,1874 ----
                 (insert "X-Coding-System: "
                         (symbol-name last-coding-system-used)
                         "\n"))
!              (narrow-to-region (point) (point-max))
!              (and (= 0 (% count 10))
!                   (message "Converting to Babyl format...%d" count)))
              ;;
              ;; This kludge is because some versions of sendmail.el
              ;; insert an extra newline at the beginning that shouldn't