From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 8 Sep 2006 12:02:13 +0000 (+0000)
Subject: (rmail-get-new-mail): Say whether all msgs are spam.
X-Git-Tag: emacs-pretest-22.0.90~694
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee1d889f35c91fb491b465a48d3f3f665a562528;p=emacs.git

(rmail-get-new-mail): Say whether all msgs are spam.
(rmail-convert-to-babyl-format): Don't record undo, leave list empty.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 195eb60830c..473175e142b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1677,12 +1677,15 @@ It returns t if it got any new messages."
 			 (if (and (featurep 'rmail-spam-filter)
 				  rmail-use-spam-filter
 				  (> rsf-number-of-spam 0))
-			     (if (= 1 new-messages)
-				 ", and found to be a spam message"
-			       (if (> rsf-number-of-spam 1)
-				   (format ", %d of which found to be spam messages"
-					   rsf-number-of-spam)
-				 ", one of which found to be a spam message"))
+			     (cond ((= 1 new-messages)
+				    ", and appears to be spam")
+				   ((= rsf-number-of-spam new-messages)
+				    ", and all appear to be spam")
+				   ((> rsf-number-of-spam 1)
+				    (format ", and %d appear to be spam"
+					    rsf-number-of-spam))
+				   (t
+				    ", and 1 appears to be spam"))
 			   ""))
 		(if (and (featurep 'rmail-spam-filter)
 			 rmail-use-spam-filter
@@ -1900,6 +1903,7 @@ is non-nil if the user has supplied the password interactively.
 (defun rmail-convert-to-babyl-format ()
   (let ((count 0) start
 	(case-fold-search nil)
+	(buffer-undo-list t)
 	(invalid-input-resync
 	 (function (lambda ()
 		     (message "Invalid Babyl format in inbox!")
@@ -2173,6 +2177,7 @@ is non-nil if the user has supplied the password interactively.
 	      ;; may still be in use.  -- rms, 7 May 1993.
 	      ((eolp) (delete-char 1))
 	      (t (error "Cannot convert to babyl format")))))
+    (setq buffer-undo-list nil)
     count))
 
 ;; Delete the "From ..." line, creating various other headers with