# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 718596310 0
# Node ID c017b62c807305fc5a01c2be25667e128e4ea6cd
# Parent  e5cb5060bb5135d386e65be9a742632aae3a2450
(mail-unsent-separator): Allow "original message" as alternative.
Allow extra dashes and spaces.
(rmail-retry-failure): Ignore case while searching for unsent sep.

diff -r e5cb5060bb51 -r c017b62c8073 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Thu Oct 08 08:35:26 1992 +0000
+++ b/lisp/mail/rmail.el	Fri Oct 09 02:05:10 1992 +0000
@@ -1600,7 +1600,9 @@
       (kill-buffer tembuf))))
 
 (defvar mail-unsent-separator
-  "^ *----- Unsent message follows ----- *$\\|^ *--- Returned message --- *$")
+  (concat "^ *---+ +Unsent message follows +---+ *$\\|"
+	  "^ *---+ +Returned message +---+ *$\\|"
+	  "^ *---+ +Original message +---+ *$"))
 
 (defun rmail-retry-failure ()
   "Edit a mail message which is based on the contents of the current message.
@@ -1612,8 +1614,9 @@
     (save-excursion
       ;; Narrow down to just the quoted original message
       (rmail-beginning-of-message)
-      (or (re-search-forward mail-unsent-separator nil t)
-	  (error "Cannot parse this as a failure message"))
+      (let ((case-fold-search t))
+	(or (re-search-forward mail-unsent-separator nil t)
+	    (error "Cannot parse this as a failure message")))
       (save-restriction
 	(narrow-to-region (point) (point-max))
 	;; Now mail-fetch-field will get from headers of the original message,