From 6a278b64f7356613c4a7709ed699655fa7415260 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 4 Nov 2014 21:04:30 -0800 Subject: Merge from emacs-24; up to 117669 --- lisp/mail/unrmail.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/mail/unrmail.el') diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el index 49103e5714d..8c2f3c66757 100644 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@ -241,8 +241,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use." ;; Convert From to >From, etc. (let ((case-fold-search nil) (fromline (if (eq 'mboxrd unrmail-mbox-format) - "^>*From " - "^From "))) + "\n>*From " + "\nFrom "))) (while (re-search-forward fromline nil t) (beginning-of-line) (insert ?>) -- cgit v1.2.1