Documentation parts of the scroll fix.

 src/xdisp.c (syms_of_xdisp) <scroll-conservatively>: Document the
 threshold of 100 lines for never-recentering scrolling.
 doc/emacs/display.texi (Auto Scrolling): Document the limit of 100
 lines for never-recentering scrolling with `scroll-conservatively'.

2 files changed, 13 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dda98bc73a7..6e9a169e8a8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (syms_of_xdisp) <scroll-conservatively>: Document the
+        threshold of 100 lines for never-recentering scrolling.
+
 2011-03-29  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (try_scrolling): When scrolling down aggressively,
diff --git a/src/xdisp.c b/src/xdisp.c
index 7983c118134..9e331739cd9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13003,7 +13003,10 @@ enum
   SCROLLING_NEED_LARGER_MATRICES
 };
 
-/* If scroll-conservatively is more than this, never recenter.  */
+/* If scroll-conservatively is more than this, never recenter.
+
+   If you change this, don't forget to update the doc string of
+   `scroll-conservatively' and the Emacs manual.  */
 #define SCROLL_LIMIT 100
 
 static int
@@ -26605,6 +26608,10 @@ If point moves off-screen, redisplay will scroll by up to
 onto the screen again.  If that cannot be done, then redisplay
 recenters point as usual.
 
+If the value is greater than 100, redisplay will never recenter point,
+but will always scroll just enough text to bring point into view, even
+if you move far away.
+
 A value of zero means always recenter point if it moves off screen.  */);
   scroll_conservatively = 0;