(sendmail-send-it): Make deletion of empty subject line work reliably.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index dc7b848ca7341256018ef1e4327c4167d70ddf35..a5fdc8d5d47cba1c49012ff75c6cb101351d2621 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -532,7 +532,11 @@ the user from the mailer."
            ;; Don't send out a blank subject line
            (goto-char (point-min))
            (if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t)
-               (replace-match ""))
+               (replace-match "")
+             ;; This one matches a Subject just before the header delimiter.
+             (if (and (re-search-forward "^Subject:\\([ \t]*\n\\)+" delimline t)
+                      (= (match-end 0) delimline))
+                 (replace-match "")))
            ;; Put the "From:" field in unless for some odd reason
            ;; they put one in themselves.
            (goto-char (point-min))