# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1074277592 0
# Node ID e58e5e015c4b6885aec9bafc6548368e51b69c21
# Parent  aa04e56e2a40dadea79485e3face9cc50fab7f81
*** empty log message ***

diff -r aa04e56e2a40 -r e58e5e015c4b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 16 18:25:33 2004 +0000
+++ b/lisp/ChangeLog	Fri Jan 16 18:26:32 2004 +0000
@@ -1,3 +1,17 @@
+2004-01-16  Richard M. Stallman  <rms@gnu.org>
+
+	* emacs-lisp/cl.el (cl-cannot-unload): New function.
+	(cl-unload-hook): Defvar this to run cl-cannot-unload.
+
+	* mail/rmail.el (rmail-get-new-mail): New local rsf-number-of-spam.
+	Call rmail-spam-filter.  Delete and expunge spam.
+	Print number of spam messages deleted.
+	Save and restore the deletion status of old messages when reading
+	new mail with spam filter, so that expunging spam does not expunge
+	msgs deleted by the user.
+	(rmail-only-expunge): added an optional argument dont-show to
+	prevent showing message after expunge.
+
 2004-01-15  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* emacs-lisp/cl.el (declare): Add `fmakunbound' for `declare'.