(syms_of_xdisp) <scroll-conservatively>: Doc fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a340264d175472d42366aa6fa9984fc20b973cd..90768f33c4c8083026780b8ea08418fbf74ff3c8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-01  Richard Stallman  <rms@gnu.org>
+
+       * xdisp.c (syms_of_xdisp) <scroll-conservatively>: Doc fix.
+
 2007-11-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * mac.c (cfsockets_for_select) [MAC_OSX && SELECT_USE_CFSOCKET]:

diff --git a/src/xdisp.c b/src/xdisp.c
index 9a5131a047b9c1a585151820b23dafb1a228a707..13660f413e70a5b9ee673abafaea1871972f39f7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24104,8 +24104,12 @@ If you want scrolling to always be a line at a time, you should set
 
   DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
     doc: /* *Scroll up to this many lines, to bring point back on screen.
-A value of zero means to scroll the text to center point vertically
-in the window.  */);
+If point moves off-screen, redisplay will scroll by up to
+`scroll-conservatively' lines in order to bring point just barely
+onto the screen again.   If that cannot be done, then redisplay
+recenters point as usual.
+
+A value of zero means always recenter point if it moves off screen.  */);
   scroll_conservatively = 0;
 
   DEFVAR_INT ("scroll-margin", &scroll_margin,