summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2007-12-01 22:44:08 +0000
committerRichard M. Stallman <rms@gnu.org>2007-12-01 22:44:08 +0000
commitd0f44b7145d9876b4946c7f324d2ba2d06194922 (patch)
tree95291814dca12c356879a6399927020735ad7386 /src
parentc73c3ee9a090c5af501b95501515e98389067241 (diff)
downloademacs-d0f44b7145d9876b4946c7f324d2ba2d06194922.tar.gz
(syms_of_xdisp) <scroll-conservatively>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2a340264d17..90768f33c4c 100644
--- 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 9a5131a047b..13660f413e7 100644
--- 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,