Synch up with flim-1_14

diff --git a/ChangeLog b/ChangeLog
index 8560a34..0723d0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-03  Shuhei KOBAYASHI  <shuhei@aqua.ocn.ne.jp>
+
+       * hmac-md5.el: Removed kludge for Emacs 21 prerelease versions.
+
+2001-07-16  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * smtpmail.el (smtpmail-send-it): Work even if the first line of
+       the subject field has no content (synch with Emacs 20.3).
+
 2001-09-21  Kenichi OKADA  <okada@opaopa.org>
 
        * smtp.el(smtp-submit-package): Check extensions for starttls.

diff --git a/hmac-md5.el b/hmac-md5.el
index d003b50..097a959 100644 (file)
--- a/hmac-md5.el
+++ b/hmac-md5.el
@@ -65,12 +65,6 @@
 
 (eval-when-compile (require 'hmac-def))
 (require 'hex-util)                    ; (decode-hex-string STRING)
-;; Kludge for Emacs pretest 21.0.90 - 21.0.100 !!!
-;; they have `md5' as a built-in function but do not provide 'md5.
-(eval-and-compile
-  (if (and (fboundp 'md5)
-          (subrp (symbol-function 'md5)))
-      (provide 'md5)))
 (require 'md5)                         ; expects (md5 STRING)
 
 ;; To share *.elc files between Emacs w/ and w/o DL patch,

diff --git a/smtpmail.el b/smtpmail.el
index dae1378..cdc396c 100644 (file)
--- a/smtpmail.el
+++ b/smtpmail.el
@@ -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))