summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2015-01-29 02:22:34 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2015-01-29 02:22:34 +0000
commit972282f3bdb12188193e453aa470591d7d52cb7e (patch)
tree7c7b369f31495554c755e9a900352841feef7308
parent7779da6fc1ff3628e1b754a5bef898d8fbdb4b7b (diff)
downloademacs-972282f3bdb12188193e453aa470591d7d52cb7e.tar.gz
[Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make non-standard mail header separators work with smtpmail
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/message.el5
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d0a68b7f0ce..592f34d6fbf 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-29 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * message.el (message-smtpmail-send-it): Remove the mail header
+ separator before sending.
+
2015-01-28 Elias Oltmanns <eo@nebensachen.de>
* nnimap.el (nnimap-find-expired-articles): Fix handling of
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c37b9397529..646aa8ffeee 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4828,6 +4828,11 @@ evaluates `message-send-mail-hook' just before sending a message.
It is useful if your ISP requires the POP-before-SMTP
authentication. See the Gnus manual for details."
(run-hooks 'message-send-mail-hook)
+ ;; Change header-delimiter to be what smtpmail expects.
+ (goto-char (point-min))
+ (when (re-search-forward
+ (concat "^" (regexp-quote mail-header-separator) "\n"))
+ (replace-match "\n"))
(smtpmail-send-it))
(defun message-send-mail-with-mailclient ()