[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101826: Reduce rmail.el's use of sen
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101826: Reduce rmail.el's use of sendmail.el |
Date: |
Wed, 06 Oct 2010 19:42:30 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101826
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-10-06 19:42:30 -0700
message:
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.
modified:
lisp/ChangeLog
lisp/mail/rmail.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-07 02:37:39 +0000
+++ b/lisp/ChangeLog 2010-10-07 02:42:30 +0000
@@ -1,5 +1,11 @@
2010-10-07 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2010-08-29 16:17:13 +0000
+++ b/lisp/mail/rmail.el 2010-10-07 02:42:30 +0000
@@ -3838,9 +3838,7 @@
(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 @@
;; 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 @@
(provide 'rmail)
-;; arch-tag: 65d257d3-c281-4a65-9c38-e61af95af2f0
;;; rmail.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101826: Reduce rmail.el's use of sendmail.el,
Glenn Morris <=