X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=smtpmail.el;h=cdc396c0ec579fc867a6516a68ca2ec6b7476a15;hb=caf43ddadf46a06e795f0a220118fca4318af85f;hp=8b3f9f42b986a53b2d99e5e33112982a0bb3b821;hpb=8573c0ae2ffab0fc8ec32fcf9faaa3afb6da0442;p=elisp%2Fflim.git

diff --git a/smtpmail.el b/smtpmail.el
index 8b3f9f4..cdc396c 100644
--- a/smtpmail.el
+++ b/smtpmail.el
@@ -1,6 +1,6 @@
 ;;; smtpmail.el --- SMTP interface for mail-mode
 
-;; Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Keywords: mail
@@ -154,8 +154,12 @@ This is relative to `smtpmail-queue-dir'.")
 ;;;		   (insert "Sender: " (user-login-name) "\n")))
 	    ;; Don't send out a blank subject line
 	    (goto-char (point-min))
-	    (if (re-search-forward "^Subject:[ \t]*\n" delimline t)
-		(replace-match ""))
+	    (if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t)
+		(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))