[Emacs-diffs] emacs-24 c96c93f 1/2: [Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make non-standard mail header separators work with smtpmail

[Katsumi Yamaoka]

branch: emacs-24
commit c96c93fad1bc0c15a6e680ac38c2cbc56e55bed9
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    [Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make 
non-standard mail header separators work with smtpmail
---
 lisp/gnus/ChangeLog  |    5 +++++
 lisp/gnus/message.el |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d0a68b7..592f34d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-29  Lars Ingebrigtsen  <address@hidden>
+
+       * message.el (message-smtpmail-send-it): Remove the mail header
+       separator before sending.
+
 2015-01-28  Elias Oltmanns  <address@hidden>
 
        * nnimap.el (nnimap-find-expired-articles): Fix handling of
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c37b939..646aa8f 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 ()