# HG changeset patch
# User Katsumi Yamaoka <katsumi@flagship2>
# Date 1277122685 0
# Node ID 2b07fb05e3eddd765da0fb1533ad4ade2a814995
# Parent  a4002b21a37b583fbdccada20c8d8c2f5e1d83bd# Parent  85a8c1358bb7ae82015253a8f04b51b343b6fc04
Merge from mainline.

diff -r a4002b21a37b -r 2b07fb05e3ed INSTALL
--- a/INSTALL	Sun Jun 20 11:23:04 2010 +0000
+++ b/INSTALL	Mon Jun 21 12:18:05 2010 +0000
@@ -105,8 +105,7 @@
 
   Note that the install automatically saves space by compressing
   (provided you have the `gzip' program) those installed Lisp source (.el)
-  files that have corresponding .elc versions.  You may also wish
-  to compress the installed Info files.
+  files that have corresponding .elc versions, as well as the Info files.
 
 
 ADDITIONAL DISTRIBUTION FILES
diff -r a4002b21a37b -r 2b07fb05e3ed src/ChangeLog
--- a/src/ChangeLog	Sun Jun 20 11:23:04 2010 +0000
+++ b/src/ChangeLog	Mon Jun 21 12:18:05 2010 +0000
@@ -1,3 +1,9 @@
+2010-06-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (try_scrolling): When scroll-conservatively is set to
+	most-positive-fixnum, be extra accurate when scrolling window
+	start, to avoid missing the cursor line.
+
 2010-06-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (try_scrolling): Compute the limit for searching point
diff -r a4002b21a37b -r 2b07fb05e3ed src/xdisp.c
--- a/src/xdisp.c	Sun Jun 20 11:23:04 2010 +0000
+++ b/src/xdisp.c	Mon Jun 21 12:18:05 2010 +0000
@@ -13486,7 +13486,26 @@
 	return SCROLLING_FAILED;
 
       start_display (&it, w, startp);
-      move_it_vertically (&it, amount_to_scroll);
+      if (scroll_max < INT_MAX)
+	move_it_vertically (&it, amount_to_scroll);
+      else
+	{
+	  /* Extra precision for users who set scroll-conservatively
+	     to most-positive-fixnum: make sure the amount we scroll
+	     the window start is never less than amount_to_scroll,
+	     which was computed as distance from window bottom to
+	     point.  This matters when lines at window top and lines
+	     below window bottom have different height.  */
+	  struct it it1 = it;
+	  /* We use a temporary it1 because line_bottom_y can modify
+	     its argument, if it moves one line down; see there.  */
+	  int start_y = line_bottom_y (&it1);
+
+	  do {
+	    move_it_by_lines (&it, 1, 1);
+	    it1 = it;
+	  } while (line_bottom_y (&it1) - start_y < amount_to_scroll);
+	}
 
       /* If STARTP is unchanged, move it down another screen line.  */
       if (CHARPOS (it.current.pos) == CHARPOS (startp))