Commit 58d1ac6d authored by Glenn Morris's avatar Glenn Morris
Browse files

Reduce rmail.el's use of sendmail.el

* lisp/mail/rmail.el (mail-sendmail-delimit-header, mail-header-end)
(mail-position-on-field): Remove declarations.
(mail-position-on-field): Autoload it.
(rmail-retry-failure): Replace use of mail-sendmail-delimit-header
and mail-header-end.  Don't require sendmail.
parent 7b9235ad
2010-10-07 Glenn Morris <rgm@gnu.org>
 
* mail/rmail.el (mail-sendmail-delimit-header, mail-header-end)
(mail-position-on-field): Remove declarations.
(mail-position-on-field): Autoload it.
(rmail-retry-failure): Replace use of mail-sendmail-delimit-header
and mail-header-end. Don't require sendmail.
* emacs-lisp/shadow.el (shadow-font-lock-keywords): New variable.
(shadow-mode): New mode.
(shadow-find-file): New button.
......
......@@ -3838,9 +3838,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.
......@@ -3926,18 +3924,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"))
......@@ -4456,5 +4455,4 @@ following the containing message.
(provide 'rmail)
;; arch-tag: 65d257d3-c281-4a65-9c38-e61af95af2f0
;;; rmail.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment