* wl-summary.el (wl-summary-resend-bounced-mail): Loosen regexp.

* wl-vars.el (wl-rejected-letter-start): Add pattern for qmail.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 77e4950..d427b2a 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-summary.el (wl-summary-resend-bounced-mail): Loosen regexp.
+
+       * wl-vars.el (wl-rejected-letter-start): Add pattern for qmail.
+
 2002-07-01  Akihiro MOTOKI  <amotoki@dd.iij4u.or.jp>
 
        * wl-vars.el (wl-forward-subject-prefix): New variable.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index aae717f..5853eb0 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -641,7 +641,7 @@ you."
                              (concat "^--" boundary "\n"
                                      "\\([Cc]ontent-[Dd]escription:.*\n\\)?"
                                      "[Cc]ontent-[Tt]ype:[ \t]+"
-                                     "\\(message/rfc822\\|text/rfc822-headers\\)\n"
+                                     "\\(message/rfc822\\|text/rfc822-headers\\).*\n"
                                      "\\(.+\n\\)*\n") nil t))
                 (re-search-forward
                  (concat "\n\\(--" boundary "\\)--\n") nil t))

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 028f7bc..7cdd9ab 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1624,7 +1624,7 @@ might set this variable to '(\"-f\" \"you@some.where\")."
   :group 'wl-draft)
 
 (defcustom wl-rejected-letter-start
-  "^[\t ]*-+[\t ]+\\(original\\|\\(\\(the \\)?unsent\\)\\) message\\( follows\\)?[\t ]+-+[\t ]*$"
+  "^[\t ]*-+[\t ]+\\(\\(original\\|\\(\\(the \\)?unsent\\)\\) message\\( follows\\)?[\t ]+-+[\t ]*\\|Below this line is a copy of the message\\..*\\)$"
   "Regexp specifying the beginning of the wrapper around a returned letter.
 This wrapper is generated by the mail system when rejecting a letter."
   :type 'regexp