Comment change.

2 files changed, 16 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22cb44249a3..129d97dd8f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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'.
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index cbeaaa62600..733129fc74f 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -137,8 +137,8 @@ is nil, raise an error."
     ;; Try to avoid losing badly when hooks installed in critical
     ;; places go away.  (Some packages install things on
     ;; `kill-buffer-hook', `activate-menubar-hook' and the like.)
-    ;; First off, provide a clean way for package `foo' to arrange
-    ;; this by defining `foo-unload-hook'.
+    ;; First off, provide a clean way for package FOO to arrange
+    ;; this by adding hooks on the variable `FOO-unload-hook'.
     (if unload-hook
         (run-hooks unload-hook)
       ;; Otherwise, do our best.  Look through the obarray for symbols