Mercurial > emacs
changeset 101839:1eedc742bd61
Sync final change from rmail-mox-branch, rev 1.13.2.4, 2006-01-16.
Alex Schroeder <alex at gnu.org>
(unrmail): Use regexps to find message separators so as not to match
any fake rmime.el separators. Remove any sections added by rmime.el.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 07 Feb 2009 03:01:59 +0000 |
| parents | a4a5037b3040 |
| children | 0d6b005df475 |
| files | lisp/mail/unrmail.el |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/unrmail.el Fri Feb 06 17:19:10 2009 +0000 +++ b/lisp/mail/unrmail.el Sat Feb 07 03:01:59 2009 +0000 @@ -107,11 +107,12 @@ (from-buffer (current-buffer))) ;; Process the messages one by one. - (while (search-forward "\^_\^l" nil t) + (while (re-search-forward "^\^_\^l" nil t) (let ((beg (point)) (end (save-excursion - (if (search-forward "\^_" nil t) - (1- (point)) (point-max)))) + (if (re-search-forward "^\^_\\(\^l\\|\\'\\)" nil t) + (match-beginning 0) + (point-max)))) (coding 'raw-text) label-line attrs keywords mail-from reformatted) @@ -173,6 +174,12 @@ (re-search-forward "^[*][*][*] EOOH [*][*][*]\n") (delete-region (point-min) (point))) + ;; Handle rmime formatting. + (when (require 'rmime nil t) + (let ((start (point))) + (while (search-forward rmime-magic-string nil t)) + (delete-region start (point)))) + ;; Some operations on the message header itself. (goto-char (point-min)) (save-restriction