*** empty log message ***

lisp/ChangeLog

+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

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>