Make mail-sendmail-undelimit-header actually remove the delimiter

* lisp/mail/sendmail.el (mail-sendmail-undelimit-header): Actually
remove the mail header separator (bug#17488).  In all the cases
where this is called, the separator will probably already have
been removed, so the only thing this does is place point at the
end of the headers.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index c9f8fec1e1bede45727c7523f0894226d3bdf46d..ab6ac4b1885571891c6a4fe9b154b2cef00102f9 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -784,8 +784,10 @@ Concretely: replace the first blank line in the header with the separator."
 (defun mail-sendmail-undelimit-header ()
   "Remove header separator to put the message in correct form for sendmail.
 Leave point at the start of the delimiter line."
-  (rfc822-goto-eoh)
-  (delete-region (point) (progn (end-of-line) (point))))
+  (goto-char (point-min))
+  (when (re-search-forward (concat "^" (regexp-quote mail-header-separator) "\n"))
+    (replace-match "\n"))
+  (rfc822-goto-eoh))
 
 (defun mail-mode-auto-fill ()
   "Carry out Auto Fill for Mail mode.