Mercurial > emacs
changeset 20984:f27355b19aba
(rmail-retry-failure): Don't insist on finding
MIME delimiter again at end of bounce text.
(mail-unsent-separator): Accept "Your message follows".
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 25 Feb 1998 23:26:45 +0000 |
| parents | 288cf06bf65c |
| children | 020b0eade8c5 |
| files | lisp/mail/rmail.el |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/rmail.el Wed Feb 25 23:18:15 1998 +0000 +++ b/lisp/mail/rmail.el Wed Feb 25 23:26:45 1998 +0000 @@ -2813,6 +2813,7 @@ "^ *---+ +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 @@ (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)