[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99990: Fix rmail-forward with non-sendmail sending function.

[Glenn Morris]

------------------------------------------------------------
revno: 99990
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-08-20 00:11:35 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-19 14:37:31 +0000
+++ b/lisp/ChangeLog    2010-08-20 07:11:35 +0000
@@ -1,3 +1,10 @@
+2010-08-20  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * subr.el (read-key): Don't hide the menu-bar entries (bug#6881).

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2010-07-21 11:31:22 +0000
+++ b/lisp/mail/rmail.el        2010-08-20 07:11:35 +0000
@@ -191,8 +191,6 @@
   :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 @@
 (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 @@
          ;; 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 @@
                           (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 @@
            (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))