2001-06-06 Peter M\e,Ax\e(Bller Neergaard <turtle@bu.edu>

	* wl-summary.el (wl-summary-resend-bounced-mail): Modified regexp
	for postfix.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index cabd3ee..b718031 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-06  Peter Møller Neergaard <turtle@bu.edu>
+
+       * wl-summary.el (wl-summary-resend-bounced-mail): Modified regexp
+       for postfix.
+
 2001-06-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-draft.el (wl-draft-edit-string): Fetch From: field value and

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 4ca35b8..20ceab1 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -603,7 +603,7 @@ you."
        (cond
         ((and
           (re-search-forward
-           (concat "^\\($\\|[Cc]ontent-[Tt]ype:[ \t]+multipart/report\\)") nil t)
+           (concat "^\\($\\|[Cc]ontent-[Tt]ype:[ \t]+multipart/\\(report\\|mixed\\)\\)") nil t)
           (not (bolp))
           (re-search-forward "boundary=\"\\([^\"]+\\)\"" nil t))
          (let ((boundary (buffer-substring (match-beginning 1) (match-end 1)))
@@ -611,6 +611,7 @@ you."
            (cond
             ((and (setq start (re-search-forward
                           (concat "^--" boundary "\n"
+                                  "\\([Cc]ontent-[Dd]escription:.*\n\\)?"
                                   "[Cc]ontent-[Tt]ype:[ \t]+"
                                   "\\(message/rfc822\\|text/rfc822-headers\\)\n"
                                   "\\(.+\n\\)*\n") nil t))