[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.1 emacs/lisp/mail/rmail.el:1.360.2.2
*** emacs/lisp/mail/rmail.el:1.360.2.1  Fri Apr  4 01:20:27 2003
--- emacs/lisp/mail/rmail.el    Tue Oct 14 19:39:25 2003
***************
*** 152,158 ****
          "\\|^status:\\|^received:\\|^x400-originator:\\|^x400-recipients:"
          "\\|^x400-received:\\|^x400-mts-identifier:\\|^x400-content-type:"
          "\\|^\\(resent-\\|\\)message-id:\\|^summary-line:\\|^resent-date:"
!         "\\|^nntp-posting-host:\\|^path:\\|^x-char.*:\\|^x-face:"
          "\\|^x-mailer:\\|^delivered-to:\\|^lines:\\|^mime-version:"
          "\\|^content-transfer-encoding:\\|^x-coding-system:"
          "\\|^return-path:\\|^errors-to:\\|^return-receipt-to:"
--- 152,158 ----
          "\\|^status:\\|^received:\\|^x400-originator:\\|^x400-recipients:"
          "\\|^x400-received:\\|^x400-mts-identifier:\\|^x400-content-type:"
          "\\|^\\(resent-\\|\\)message-id:\\|^summary-line:\\|^resent-date:"
!         "\\|^nntp-posting-host:\\|^path:\\|^x-char.*:\\|^x-face:\\|^face:"
          "\\|^x-mailer:\\|^delivered-to:\\|^lines:\\|^mime-version:"
          "\\|^content-transfer-encoding:\\|^x-coding-system:"
          "\\|^return-path:\\|^errors-to:\\|^return-receipt-to:"
***************
*** 212,218 ****
  ;;;###autoload
  (defcustom rmail-primary-inbox-list nil "\
  *List of files which are inboxes for user's primary mail file `~/RMAIL'.
! `nil' means the default, which is (\"/usr/spool/mail/$USER\")
  \(the name varies depending on the operating system,
  and the value of the environment variable MAIL overrides it)."
    ;; Don't use backquote here, because we don't want to need it
--- 212,218 ----
  ;;;###autoload
  (defcustom rmail-primary-inbox-list nil "\
  *List of files which are inboxes for user's primary mail file `~/RMAIL'.
! nil means the default, which is (\"/usr/spool/mail/$USER\")
  \(the name varies depending on the operating system,
  and the value of the environment variable MAIL overrides it)."
    ;; Don't use backquote here, because we don't want to need it
***************
*** 1652,1663 ****
                              (save-excursion
                                (skip-chars-forward " \t\n")
                                (point)))
!              (setq last-coding-system-used nil)
!              (or rmail-enable-mime
!                  (not rmail-enable-multibyte)
!                  (decode-coding-region start (point)
!                                        (or rmail-file-coding-system
!                                            'undecided)))
               ;; Add an X-Coding-System: header if we don't have one.
               (save-excursion
                 (goto-char start)
--- 1652,1717 ----
                              (save-excursion
                                (skip-chars-forward " \t\n")
                                (point)))
!              (save-excursion
!                (let* ((header-end
!                        (progn
!                          (save-excursion
!                            (goto-char start)
!                            (forward-line 1)
!                            (if (looking-at "0")
!                                (forward-line 1)
!                              (forward-line 2))
!                            (save-restriction
!                              (narrow-to-region (point) (point-max))
!                              (rfc822-goto-eoh)
!                              (point)))))
!                       (case-fold-search t)
!                       (quoted-printable-header-field-end
!                        (save-excursion
!                          (goto-char start)
!                          (re-search-forward
!                           "^content-transfer-encoding:\\(\n?[\t 
]\\)*quoted-printable\\(\n?[\t ]\\)*"
!                           header-end t)))
!                       (base64-header-field-end
!                        (save-excursion
!                          (goto-char start)
!                          (re-search-forward
!                           "^content-transfer-encoding:\\(\n?[\t 
]\\)*base64\\(\n?[\t ]\\)*"
!                           header-end t))))
!                  (if quoted-printable-header-field-end
!                      (save-excursion
!                        (rmail-decode-quoted-printable header-end (point))
!                        ;; Change "quoted-printable" to "8bit",
!                        ;; to reflect the decoding we just did.
!                        (goto-char quoted-printable-header-field-end)
!                        (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)
!                      (let ((mime-charset
!                             (if (and rmail-decode-mime-charset
!                                      (save-excursion
!                                        (goto-char start)
!                                        (search-forward "\n\n" nil t)
!                                        (let ((case-fold-search t))
!                                          (re-search-backward
!                                           rmail-mime-charset-pattern
!                                           start t))))
!                                 (intern (downcase (match-string 1))))))
!                        (rmail-decode-region start (point) mime-charset)))))
               ;; Add an X-Coding-System: header if we don't have one.
               (save-excursion
                 (goto-char start)
***************
*** 1714,1719 ****
--- 1768,1778 ----
                         (re-search-forward
                          "^content-transfer-encoding:\\(\n?[\t 
]\\)*quoted-printable\\(\n?[\t ]\\)*"
                          header-end t)))
+                     (base64-header-field-end
+                      (save-excursion
+                        (re-search-forward
+                         "^content-transfer-encoding:\\(\n?[\t 
]\\)*base64\\(\n?[\t ]\\)*"
+                         header-end t)))
                      (size
                       ;; Get the numeric value from the Content-Length field.
                       (save-excursion
***************
*** 1762,1767 ****
--- 1821,1834 ----
                       ;; to reflect the decoding we just did.
                       (goto-char quoted-printable-header-field-end)
                       (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
***************
*** 3755,3758 ****
--- 3822,3826 ----
  
  (provide 'rmail)
  
+ ;;; arch-tag: cff0a950-57fe-4f73-a86e-91ff75afd06c
  ;;; rmail.el ends here