diff options
| author | Richard M. Stallman | 2006-09-08 12:02:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-09-08 12:02:13 +0000 |
| commit | ee1d889f35c91fb491b465a48d3f3f665a562528 (patch) | |
| tree | 83651559874a8274eb832c7298b9a6a80b715c26 | |
| parent | b8bd37f2f80d5436ad2d4a18561da1dc69f54ac4 (diff) | |
| download | emacs-ee1d889f35c91fb491b465a48d3f3f665a562528.tar.gz emacs-ee1d889f35c91fb491b465a48d3f3f665a562528.zip | |
(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 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." | |||
| 1677 | (if (and (featurep 'rmail-spam-filter) | 1677 | (if (and (featurep 'rmail-spam-filter) |
| 1678 | rmail-use-spam-filter | 1678 | rmail-use-spam-filter |
| 1679 | (> rsf-number-of-spam 0)) | 1679 | (> rsf-number-of-spam 0)) |
| 1680 | (if (= 1 new-messages) | 1680 | (cond ((= 1 new-messages) |
| 1681 | ", and found to be a spam message" | 1681 | ", and appears to be spam") |
| 1682 | (if (> rsf-number-of-spam 1) | 1682 | ((= rsf-number-of-spam new-messages) |
| 1683 | (format ", %d of which found to be spam messages" | 1683 | ", and all appear to be spam") |
| 1684 | rsf-number-of-spam) | 1684 | ((> rsf-number-of-spam 1) |
| 1685 | ", one of which found to be a spam message")) | 1685 | (format ", and %d appear to be spam" |
| 1686 | rsf-number-of-spam)) | ||
| 1687 | (t | ||
| 1688 | ", and 1 appears to be spam")) | ||
| 1686 | "")) | 1689 | "")) |
| 1687 | (if (and (featurep 'rmail-spam-filter) | 1690 | (if (and (featurep 'rmail-spam-filter) |
| 1688 | rmail-use-spam-filter | 1691 | rmail-use-spam-filter |
| @@ -1900,6 +1903,7 @@ is non-nil if the user has supplied the password interactively. | |||
| 1900 | (defun rmail-convert-to-babyl-format () | 1903 | (defun rmail-convert-to-babyl-format () |
| 1901 | (let ((count 0) start | 1904 | (let ((count 0) start |
| 1902 | (case-fold-search nil) | 1905 | (case-fold-search nil) |
| 1906 | (buffer-undo-list t) | ||
| 1903 | (invalid-input-resync | 1907 | (invalid-input-resync |
| 1904 | (function (lambda () | 1908 | (function (lambda () |
| 1905 | (message "Invalid Babyl format in inbox!") | 1909 | (message "Invalid Babyl format in inbox!") |
| @@ -2173,6 +2177,7 @@ is non-nil if the user has supplied the password interactively. | |||
| 2173 | ;; may still be in use. -- rms, 7 May 1993. | 2177 | ;; may still be in use. -- rms, 7 May 1993. |
| 2174 | ((eolp) (delete-char 1)) | 2178 | ((eolp) (delete-char 1)) |
| 2175 | (t (error "Cannot convert to babyl format"))))) | 2179 | (t (error "Cannot convert to babyl format"))))) |
| 2180 | (setq buffer-undo-list nil) | ||
| 2176 | count)) | 2181 | count)) |
| 2177 | 2182 | ||
| 2178 | ;; Delete the "From ..." line, creating various other headers with | 2183 | ;; Delete the "From ..." line, creating various other headers with |