[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/09/08 12:02:13

Index: rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -b -r1.426 -r1.427
--- rmail.el    20 May 2006 17:36:07 -0000      1.426
+++ rmail.el    8 Sep 2006 12:02:13 -0000       1.427
@@ -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