summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mail/rmail.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 95e25add522..de626fb40cf 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1600,7 +1600,9 @@ typically for purposes of moderating a list."
(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 @@ the body of the original message; otherwise copy the current message."
(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,