*** empty log message ***

2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 880e246fc8f..7c57c4c428a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2000-12-22  Gerd Moellmann  <gerd@gnu.org>
 
+        * simple.el (delete-key-deletes-forward-mode): Simplify.  Also
+        backspace key combinations, depending on
+        delete-key-deletes-forward.
+
+        * bindings.el ([C-backspace]): Bind C-backspace to kill-word.
+
         * simple.el (delete-key-deletes-forward): Doc fix.
 
 2000-08-22  Emmanuel Briot  <briot@gnat.com>
diff --git a/src/ChangeLog b/src/ChangeLog
index 1d076114f9b..149df461daa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,10 @@
 
 2000-12-22  Gerd Moellmann  <gerd@gnu.org>
 
+        * window.c (size_window): When setting the window's too_small_ok
+        flag, compare old size with minimum size depending on WIDTH_P,
+        don't compare with window_min_width.
+        
         * window.c (delete_window): Simplify somewhat.
         (Fset_window_configuration): Don't SET_FRAME_GARBAGED after
         freeing window matrices.  The flag windows_or_buffers_changed is