*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1254ec2da8bf71eec9180011a7359ee7d8127f1a..774adf851ac77d5e713a217932cf71331945957d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-12-12  Gerd Moellmann  <gerd@gnu.org>
 
+       * mail/rmailsum.el (rmail-summary-expunge)
+       (rmail-summary-expunge-and-save): Use rmail-expunge-confirmed
+       instead of rmail-confirm-expunge.
+
        * replace.el (perform-replace): Don't use an empty match adjacent
        to a non-empty match when computing the next match before the
        replacement is performed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 100c67b099a5655e0fea97582fd6879fce40d74a..96b967cf8c6d0f9f826684eebee16977513d21ff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,9 @@
 
 2000-12-12  Gerd Moellmann  <gerd@gnu.org>
 
+       * buffer.c (Fkill_buffer): Don't Fset_buffer when testing if
+       the buffer is the sole visible buffer when in the mini-buffer.
+
        * xdisp.c (setup_echo_area_for_printing, with_echo_area_buffer): 
        Bind `inhibit-read-only' to t.
        (unwind_with_echo_area_buffer): Use AREF.