*** empty log message ***

2 files changed, 13 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e73ff7926a2..09ff4f46feb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-22  Gerd Moellmann  <gerd@gnu.org>
+
+        * mail/rmail.el (rmail-confirm-expunge): Default to 
+        y-or-n-p.
+        
 2000-11-22  Stefan Monnier  <monnier@cs.yale.edu>
 
         * textmodes/tex-mode.el (tex-font-lock-keywords-1):
@@ -21,11 +26,15 @@
 
 2000-11-22  Sam Steingold  <sds@gnu.org>
 
-        * simple.el (delete-trailing-whitespace): New interactive function.
+        * simple.el (delete-trailing-whitespace): New interactive
+        function.
+        
         * progmodes/ada-mode.el (ada-mode): Use it instead of
         `ada-remove-trailing-spaces'
         (ada-remove-trailing-spaces): Removed.
+        
         * textmodes/two-column.el (2C-merge): Recommend it in the doc.
+        
         * textmodes/picture.el (picture-clean): Removed.
         (picture-mode-exit): Call it instead of `picture-clean'.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 9166bb77b04..dcb69e73c4d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-11-22  Gerd Moellmann  <gerd@gnu.org>
 
+        * buffer.c (Fmake_indirect_buffer): Don't treat nil as a
+        buffer object.
+
         * frame.h (struct frame): Replace desired_tool_bar_items,
         current_tool_bar_items, n_desired_tool_bar_items,
         n_current_tool_bar_items removed with tool_bar_items and