From fb89a65490016bfb747b80a6967dc619944ef945 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Aug 2010 00:11:35 -0700 Subject: [PATCH] Fix rmail-forward with non-sendmail sending function. * lisp/mail/rmail.el (rmail-forward): Replace mail-text-start with its expansion, so as not to need sendmail. (mail-text-start): Remove declaration. (rmail-retry-failure): Require sendmail. --- lisp/ChangeLog | 7 +++++++ lisp/mail/rmail.el | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83578620420..c104d38cdfd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-08-20 Glenn Morris + + * mail/rmail.el (rmail-forward): Replace mail-text-start with its + expansion, so as not to need sendmail. + (mail-text-start): Remove declaration. + (rmail-retry-failure): Require sendmail. + 2010-08-19 Stefan Monnier * subr.el (read-key): Don't hide the menu-bar entries (bug#6881). diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index fbf5c534a28..fa0b7bef207 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -191,8 +191,6 @@ please report it with \\[report-emacs-bug].") :group 'rmail-retrieve :type '(repeat (directory))) -(declare-function mail-position-on-field "sendmail" (field &optional soft)) -(declare-function mail-text-start "sendmail" ()) (declare-function rmail-dont-reply-to "mail-utils" (destinations)) (declare-function rmail-update-summary "rmailsum" (&rest ignore)) @@ -1643,8 +1641,6 @@ The duplicate copy goes into the Rmail file just after the original." (declare-function rmail-summary-mark-deleted "rmailsum" (&optional n undel)) (declare-function rfc822-addresses "rfc822" (header-text)) (declare-function mail-abbrev-make-syntax-table "mailabbrev.el" ()) -(declare-function mail-sendmail-delimit-header "sendmail" ()) -(declare-function mail-header-end "sendmail" ()) ;; RLK feature not added in this version: ;; argument specifies inbox file or files in various ways. @@ -3686,7 +3682,8 @@ see the documentation of `rmail-resend'." ;; The mail buffer is now current. (save-excursion ;; Insert after header separator--before signature if any. - (goto-char (mail-text-start)) + (rfc822-goto-eoh) + (forward-line 1) (if (or rmail-enable-mime rmail-enable-mime-composing) (funcall rmail-insert-mime-forwarded-message-function forward-buffer) @@ -3841,6 +3838,10 @@ 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)) + (defun rmail-retry-failure () "Edit a mail message which is based on the contents of the current message. For a message rejected by the mail system, extract the interesting headers and @@ -3932,6 +3933,8 @@ specifying headers which should not be copied into the new message." (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) (save-restriction (narrow-to-region (point-min) (mail-header-end)) -- 2.11.4.GIT