diff options
| author | Richard M. Stallman <[email protected]> | 2006-09-08 12:02:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 2006-09-08 12:02:13 +0000 |
| commit | ee1d889f35c91fb491b465a48d3f3f665a562528 (patch) | |
| tree | 83651559874a8274eb832c7298b9a6a80b715c26 | |
| parent | b8bd37f2f80d5436ad2d4a18561da1dc69f54ac4 (diff) | |
(rmail-get-new-mail): Say whether all msgs are spam.
(rmail-convert-to-babyl-format): Don't record undo, leave list empty.
| -rw-r--r-- | lisp/mail/rmail.el | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 195eb60830..473175e142 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 |