[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/rmailout.el
From: |
Paul Michael Reilly |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/rmailout.el |
Date: |
Sat, 15 Feb 2003 10:38:18 -0500 |
Index: emacs/lisp/mail/rmailout.el
diff -c emacs/lisp/mail/rmailout.el:1.65 emacs/lisp/mail/rmailout.el:1.66
*** emacs/lisp/mail/rmailout.el:1.65 Sun Jul 15 12:15:35 2001
--- emacs/lisp/mail/rmailout.el Tue Feb 4 05:58:53 2003
***************
*** 225,237 ****
(if redelete (rmail-set-attribute "deleted" t))))
(setq count (1- count))
(if rmail-delete-after-output
! (unless
(if (and (= count 0) stay)
(rmail-delete-message)
(rmail-delete-forward))
(setq count 0))
(if (> count 0)
! (unless
(if (not stay) (rmail-next-undeleted-message 1))
(setq count 0)))))))
--- 225,237 ----
(if redelete (rmail-set-attribute "deleted" t))))
(setq count (1- count))
(if rmail-delete-after-output
! (unless
(if (and (= count 0) stay)
(rmail-delete-message)
(rmail-delete-forward))
(setq count 0))
(if (> count 0)
! (unless
(if (not stay) (rmail-next-undeleted-message 1))
(setq count 0)))))))
***************
*** 246,252 ****
;; NOT-RMAIL if t means this buffer does not have the full header
;; and *** EOOH *** that a message in an Rmail file has.
(defun rmail-delete-unwanted-fields (&optional not-rmail)
! (if rmail-fields-not-to-output
(save-excursion
(goto-char (point-min))
;; Find the end of the header.
--- 246,252 ----
;; NOT-RMAIL if t means this buffer does not have the full header
;; and *** EOOH *** that a message in an Rmail file has.
(defun rmail-delete-unwanted-fields (&optional not-rmail)
! (if rmail-fields-not-to-output
(save-excursion
(goto-char (point-min))
;; Find the end of the header.
***************
*** 296,309 ****
(tembuf (get-buffer-create " rmail-output"))
(original-headers-p
(and (not from-gnus)
! (save-excursion
(save-restriction
(narrow-to-region (rmail-msgbeg rmail-current-message)
(point-max))
(goto-char (point-min))
(forward-line 1)
(= (following-char) ?0)))))
header-beginning
! mail-from mime-version)
(while (> count 0)
;; Preserve the Mail-From and MIME-Version fields
;; even if they have been pruned.
--- 296,309 ----
(tembuf (get-buffer-create " rmail-output"))
(original-headers-p
(and (not from-gnus)
! (save-excursion
(save-restriction
(narrow-to-region (rmail-msgbeg rmail-current-message)
(point-max))
(goto-char (point-min))
(forward-line 1)
(= (following-char) ?0)))))
header-beginning
! mail-from mime-version content-type)
(while (> count 0)
;; Preserve the Mail-From and MIME-Version fields
;; even if they have been pruned.
***************
*** 315,325 ****
(setq header-beginning (point))
(search-forward "\n*** EOOH ***\n")
(narrow-to-region header-beginning (point))
! (setq mail-from
! (mail-fetch-field "Mail-From")
! mime-version
! (unless rmail-enable-mime
! (mail-fetch-field "MIME-Version"))))))
(save-excursion
(set-buffer tembuf)
(erase-buffer)
--- 315,324 ----
(setq header-beginning (point))
(search-forward "\n*** EOOH ***\n")
(narrow-to-region header-beginning (point))
! (setq mail-from (mail-fetch-field "Mail-From"))
! (unless rmail-enable-mime
! (setq mime-version (mail-fetch-field "MIME-Version")
! content-type (mail-fetch-field "Content-type"))))))
(save-excursion
(set-buffer tembuf)
(erase-buffer)
***************
*** 350,356 ****
"unknown"))
" " (current-time-string) "\n"))
(if mime-version
! (insert "MIME-Version: " mime-version "\n"))
;; ``Quote'' "\nFrom " as "\n>From "
;; (note that this isn't really quoting, as there is no requirement
;; that "\n[>]+From " be quoted in the same transparent way.)
--- 349,356 ----
"unknown"))
" " (current-time-string) "\n"))
(if mime-version
! (insert "MIME-Version: " mime-version
! "\nContent-type: " content-type "\n"))
;; ``Quote'' "\nFrom " as "\n>From "
;; (note that this isn't really quoting, as there is no requirement
;; that "\n[>]+From " be quoted in the same transparent way.)
***************
*** 374,380 ****
(if (and next-message-p original-headers-p)
(rmail-toggle-header))
(if (and (> count 0) (not next-message-p))
! (progn
(error
(save-excursion
(set-buffer rmailbuf)
--- 374,380 ----
(if (and next-message-p original-headers-p)
(rmail-toggle-header))
(if (and (> count 0) (not next-message-p))
! (progn
(error
(save-excursion
(set-buffer rmailbuf)