From: tomo <tomo>
Date: Mon, 28 May 2001 12:55:36 +0000 (+0000)
Subject: (smtpmail-send-it): Modify to work without mail-header-separator.
X-Git-Tag: Emacs-21_0_103-resend-fix-0
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c62448d90d11f27055133d376409f9926e5e31;p=elisp%2Flemi.git

(smtpmail-send-it): Modify to work without mail-header-separator.
---

diff --git a/mail/smtpmail.el b/mail/smtpmail.el
index c1a314e..91077b8 100644
--- a/mail/smtpmail.el
+++ b/mail/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, 2001 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Keywords: mail
@@ -110,9 +110,9 @@ This is relative to `smtpmail-queue-dir'.")
 	      (insert ?\n))
 	  ;; Change header-delimiter to be what sendmail expects.
 	  (goto-char (point-min))
-	  (re-search-forward
-	    (concat "^" (regexp-quote mail-header-separator) "\n"))
-	  (replace-match "\n")
+	  (if (re-search-forward
+	       (concat "^\\(" (regexp-quote mail-header-separator) "\\)?\n"))
+	      (replace-match "\n"))
 	  (backward-char 1)
 	  (setq delimline (point-marker))
 ;;	  (sendmail-synch-aliases)