2 files changed, 19 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b8a5d6a950..fcf2a97f8ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-21  Gerd Moellmann  <gerd@gnu.org>
+
+        * server.el (server-switch-buffer): Choose a window on a visible
+        frame.
+
 2000-12-21  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * files.el (insert-directory-safely): New function.
diff --git a/src/ChangeLog b/src/ChangeLog
index 1001433b82d..b320ddd7607 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2000-12-21  Gerd Moellmann  <gerd@gnu.org>
+
+        * window.c (delete_window, Fsplit_window) 
+        (Fset_window_configuration): Calls to ensure_frame_matrix removed.
+
+        * dispextern.h (ensure_frame_matrix): Function declaration removed.
+
+        * dispnew.c (ensure_frame_matrix): Removed.
+        (save_frame_matrix, restore_frame_matrix): New functions.
+        (adjust_frame_glyphs_for_frame_redisplay): Use them.
+
+        * xdisp.c (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
+        [GLYPH_DEBUG]: Extended to dump glyphs in short form.
+
 2000-12-21  Andrew Innes  <andrewi@gnu.org>
 
         * w32term.c (x_update_begin): Regenerate the palette here, rather