diff options
Diffstat (limited to 'lisp/mail/rmail.el')
| -rw-r--r-- | lisp/mail/rmail.el | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 3ab87fa21f7..47e52f27aa1 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3840,9 +3840,7 @@ The message should be narrowed to just the headers." (1- (point)) (point-max))))))) -(declare-function mail-sendmail-delimit-header "sendmail" ()) -(declare-function mail-header-end "sendmail" ()) -(declare-function mail-position-on-field "sendmail" (field &optional soft)) +(autoload 'mail-position-on-field "sendmail") (defun rmail-retry-failure () "Edit a mail message which is based on the contents of the current message. @@ -3928,18 +3926,19 @@ specifying headers which should not be copied into the new message." ;; Insert original text as initial text of new draft message. ;; Bind inhibit-read-only since the header delimiter ;; of the previous message was probably read-only. - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + eoh) (erase-buffer) (insert-buffer-substring rmail-this-buffer bounce-start bounce-end) (goto-char (point-min)) (if bounce-indent (indent-rigidly (point-min) (point-max) bounce-indent)) - ;; FIXME better to replace sendmail functions. - (require 'sendmail) - (mail-sendmail-delimit-header) + (rfc822-goto-eoh) + (setq eoh (point)) + (insert mail-header-separator) (save-restriction - (narrow-to-region (point-min) (mail-header-end)) + (narrow-to-region (point-min) eoh) (rmail-delete-headers rmail-retry-ignored-headers) (rmail-delete-headers "^\\(sender\\|return-path\\|received\\):") (setq resending (mail-fetch-field "resent-to")) @@ -4241,7 +4240,7 @@ encoded string (and the same mask) will decode the string." ;;; Start of automatically extracted autoloads. ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el" -;;;;;; "60db8013bf16d7999914a16cda435287") +;;;;;; "4bf8a5cdfc921b9e30680ee71b7f9ca6") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ @@ -4253,7 +4252,7 @@ Edit the contents of this message. ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" -;;;;;; "rmailkwd.el" "7027ce1ac922c0dd51262b641e4d42c1") +;;;;;; "rmailkwd.el" "112240cbb53c402294013cc49987771a") ;;; Generated autoloads from rmailkwd.el (autoload 'rmail-add-label "rmailkwd" "\ @@ -4296,7 +4295,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "4a7502b4aeb3bd5f2111b48cc6512924") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9f67f3b67de9b700b128b73c52abfefa") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ @@ -4312,7 +4311,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'. ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el" -;;;;;; "b2a72d4e370f2d2b31b6f8f0794820e4") +;;;;;; "c3575020691d5769bcf08ecc932304c3") ;;; Generated autoloads from rmailmsc.el (autoload 'set-rmail-inbox-list "rmailmsc" "\ @@ -4328,7 +4327,7 @@ This applies only to the current session. ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent ;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject -;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "5a3b5ee477d2fbf79d0c566d776a7fd4") +;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "b96e85edd736f23f1e9d54a299268d1e") ;;; Generated autoloads from rmailsort.el (autoload 'rmail-sort-by-date "rmailsort" "\ @@ -4387,7 +4386,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels -;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "26b95919c7e1f8c5609ce7323aee77ae") +;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "4715fb58fb191bf6b192458ea75524b2") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ @@ -4458,5 +4457,4 @@ following the containing message. (provide 'rmail) -;; arch-tag: 65d257d3-c281-4a65-9c38-e61af95af2f0 ;;; rmail.el ends here |