*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3df92519f037dbd5278d4dca3c58903a8c15f5c6..d15c2381b1380e4a7ec07d4a303753a20f9cd4ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-09  Miles Bader  <miles@gnu.org>
+
+       * window.el (fit-window-to-buffer): Don't pass last argument to
+       pos-visible-in-window-p, now that its meaning is inverted.
+
 2000-12-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * image.el (create-image): Doc fix; spotted by Per Cederqvist
@@ -42,6 +47,7 @@
 
        * textmodes/ispell.el (ispell): Doc fix.
 
+>>>>>>> 1.1667
 2000-12-08  Kenichi Handa  <handa@etl.go.jp>
 
        * international/quail.el (quail-insert-decode-map): Check the

diff --git a/src/ChangeLog b/src/ChangeLog
index a665944fa977240b807847183614189c51e79f60..08f329de2ef5a58060ec263aea93b7e3eb8ecd74 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,8 +4,8 @@
        with PARTIALLY, inverting the sense.
        (window_scroll_pixel_based): Scroll partially visible lines into
        place if we hit the beginning or end of the buffer.
-       (displayed_window_lines): Don't include partially visible line at
-       bottom.
+       (displayed_window_lines): Don't include partially visible lines.
+       (Fmove_to_window_line): Skip past any partially visible first line.
 
 2000-12-08  Gerd Moellmann  <gerd@gnu.org>