From: Karl Heuer <kwzh@gnu.org>
Date: Wed, 25 Feb 1998 23:26:45 +0000 (+0000)
Subject: (rmail-retry-failure): Don't insist on finding
X-Git-Tag: emacs-20.3~2090
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f980ec39f67fe2fb5d660086344d8d10b18eff47;p=emacs.git

(rmail-retry-failure): Don't insist on finding
MIME delimiter again at end of bounce text.
(mail-unsent-separator): Accept "Your message follows".
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ef55e63dda6..e9901a0526a 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2813,6 +2813,7 @@ typically for purposes of moderating a list."
 	  "^ *---+ +Original message +---+ *$\\|"
 	  "^ *--+ +begin message +--+ *$\\|"
 	  "^ *---+ +Original message follows +---+ *$\\|"
+	  "^ *---+ +Your message follows +---+ *$\\|"
 	  "^|? *---+ +Message text follows: +---+ *|?$")
   "A regexp that matches the separator before the text of a failed message.")
 
@@ -2856,13 +2857,11 @@ specifying headers which should not be copied into the new message."
 	      (or (re-search-forward mail-mime-unsent-header nil t)
 		  (error "Cannot find beginning of header in failed message"))
 	      (or (search-forward "\n\n" nil t)
-		  (error "Cannot find end of Mime data in failed message"))
+		  (error "Cannot find start of Mime data in failed message"))
 	      (setq bounce-start (point))
-	      (or (search-forward codestring nil t)
-		  (error "Cannot find end of Mime data in failed message"))
-	      (setq bounce-end (match-beginning 0))
-;	      (or (search-forward "\n\n" nil t)
-;		  (error "Cannot find end of header in failed message"))
+	      (if (search-forward codestring nil t)
+		  (setq bounce-end (match-beginning 0))
+		(setq bounce-end (point-max)))
 	      )
 	  ;; non-MIME bounce
 	  (or (re-search-forward mail-unsent-separator nil t)