From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 17 Apr 2018 06:22:17 +0000 (+0000)
Subject: * lisp/mail/sendmail.el (mail-sendmail-undelimit-header): Work for
X-Git-Tag: emacs-27.0.90~5163
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=003071346cdc914f28a8e8b3a8bf0c8f5f3b52dc;p=emacs.git

* lisp/mail/sendmail.el (mail-sendmail-undelimit-header): Work for
the case where the mail header separator has already been deleted.
---

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index ab6ac4b1885..f1c6d395997 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -785,7 +785,9 @@ Concretely: replace the first blank line in the header with the separator."
   "Remove header separator to put the message in correct form for sendmail.
 Leave point at the start of the delimiter line."
   (goto-char (point-min))
-  (when (re-search-forward (concat "^" (regexp-quote mail-header-separator) "\n"))
+  (when (re-search-forward
+	 (concat "^" (regexp-quote mail-header-separator) "\n")
+	 nil t)
     (replace-match "\n"))
   (rfc822-goto-eoh))