# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1157716933 0
# Node ID 7d4fe4b4afc9c1b0ea2e41422ae6227817d38b5b
# Parent  a3c85e1915ad28539b20f78b9cf65cf411174a09
(rmail-get-new-mail): Say whether all msgs are spam.
(rmail-convert-to-babyl-format): Don't record undo, leave list empty.

diff -r a3c85e1915ad -r 7d4fe4b4afc9 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Fri Sep 08 12:00:40 2006 +0000
+++ b/lisp/mail/rmail.el	Fri Sep 08 12:02:13 2006 +0000
@@ -1677,12 +1677,15 @@
 			 (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 @@
 (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 @@
 	      ;; 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