Commit f2da0c68 authored by Richard M. Stallman's avatar Richard M. Stallman

(mail-unsent-separator): Allow "original message" as alternative.

Allow extra dashes and spaces.
(rmail-retry-failure): Ignore case while searching for unsent sep.
parent d80788d8
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment