(rmail-retry-failure): Nicer error message

if can't find mail-unsent-separator.

1 files changed, 4 insertions, 3 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index c2b994980a6..f8e2f7cb176 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2454,9 +2454,10 @@ specifying headers which should not be copied into the new message."
             (let ((codestring
                    (buffer-substring (progn (beginning-of-line) (point))
                                      (progn (end-of-line) (point)))))
-              (re-search-forward mail-unsent-separator)
-              (search-forward codestring)
-              (or (search-forward "\n\n" nil t)
+              (or (re-search-forward mail-unsent-separator nil t)
+                  (error "Cannot find beginning of header in failed message"))
+              (or (and (search-forward codestring nil t)
+                       (search-forward "\n\n" nil t))
                   (error "Cannot find end of Mime data in failed message"))
               (setq bounce-start (point))
               (save-excursion