*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f565808ebc6d7c79d4f12399e4669fdf851b7713..55366de116f5ee16bf39f700855946e53fd6cdc9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-11  Miles Bader  <miles@gnu.org>
+
+       * window.el (window-text-height): Function removed (now in C).
+
 2000-12-10  Stefan Monnier  <monnier@cs.yale.edu>
 
        * log-edit.el (log-edit-parent-buffer): New var.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c9d7070a829c9ccc94e2616874cb197d408852d..18756b345f908bfdbc137ffe82bfba8971440ad3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
 
        * window.c (displayed_window_lines): Don't round up when
        converting empty space at bottom to lines.
+       Handle non-newline-terminated final lines properly.
+       (Fwindow_text_height): New function (used to be in lisp).
+       (syms_of_window): Initialize it.
 
 2000-12-09  Stefan Monnier  <monnier@cs.yale.edu>