X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnmail.el;h=1d018f43819f34c5481048c38c699ec0e23c0b14;hb=c29ff77741777cd02b7c0f967e53c1a0ade13ab7;hp=f80e3426f0612f34b0fbefd0e1c57dd6d39a33f2;hpb=bd252d9de5a5cb84f6bb7e09986d4a5ff1b4f2b0;p=gnus

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index f80e3426f..1d018f438 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -247,7 +247,7 @@ that) from the headers before splitting and saving the messages."
   :type 'hook)
 
 (defcustom nnmail-list-identifiers nil
-  "Regexp that match list identifiers to be removed.
+  "Regexp that matches list identifiers to be removed.
 This can also be a list of regexps."
   :group 'gnus-mail
   :type '(choice regexp
@@ -656,7 +656,7 @@ is a spool.  If not using procmail, return GROUP."
 	     (search-forward ""))
 	 (point)))
       (run-hooks 'nnmail-prepare-incoming-header-hook)
-      (widen)
+      (goto-char (point-max))
       ;; Find the Message-ID header.
       (save-excursion
 	(if (re-search-backward "^Message-ID:[ \t]*\\(<[^>]*>\\)" nil t)
@@ -684,6 +684,7 @@ is a spool.  If not using procmail, return GROUP."
 		      ;; a (possibly) faulty header.
 		      (progn (insert "X-") t))))
 	  (setq do-search t)
+	(widen)
 	(if (or (= (+ (point) content-length) (point-max))
 		(save-excursion
 		  (goto-char (+ (point) content-length))
@@ -692,6 +693,7 @@ is a spool.  If not using procmail, return GROUP."
 	      (goto-char (+ (point) content-length))
 	      (setq do-search nil))
 	  (setq do-search t)))
+      (widen)
       ;; Go to the beginning of the next article - or to the end
       ;; of the buffer.  
       (when do-search
@@ -1056,7 +1058,7 @@ Return the number of characters in the body."
     (when regexp
       (goto-char (point-min))
       (when (re-search-forward
-	     (concat "Subject: +\\(Re: +\\)?\\(" regexp "\\) *")
+	     (concat "^Subject: +\\(Re: +\\)?\\(" regexp "\\) *")
 	     nil t)
 	(delete-region (match-beginning 2) (match-end 0))))))