[Emacs-diffs] emacs/lisp/mail unrmail.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/07 03:01:59

Modified files:
        lisp/mail      : unrmail.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/unrmail.el?cvsroot=emacs&r1=1.33&r2=1.34

Patches:
Index: unrmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/unrmail.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- unrmail.el  6 Feb 2009 07:33:24 -0000       1.33
+++ unrmail.el  7 Feb 2009 03:01:59 -0000       1.34
@@ -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