summaryrefslogtreecommitdiff
path: root/doc/emacs/display.texi
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-03-26 12:20:16 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-03-26 12:20:16 -0400
commitc5c9f40f3a8e9ec614d01fbe915c4eb2aaeb1097 (patch)
tree1d7ad87cdf63f81ea73b9e4c08ba735bbec5629e /doc/emacs/display.texi
parentddc20cdb0235bf1b1840a517044e56b7eae3d07a (diff)
downloademacs-c5c9f40f3a8e9ec614d01fbe915c4eb2aaeb1097.tar.gz
* doc/emacs/display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion.
Diffstat (limited to 'doc/emacs/display.texi')
-rw-r--r--doc/emacs/display.texi12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index aad061b33d9..5df8401d918 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -195,15 +195,15 @@ how aggressively it scrolls by setting the variables
The value of @code{scroll-up-aggressively} should be either
@code{nil}, or a fraction @var{f} between 0 and 1. A fraction
specifies where on the screen to put point when scrolling upward: when
-a window scrolls up because point is above the window start, the new
-start position is chosen to put point @var{f} parts of the window
-height from the top. Thus, larger @var{f} means more aggressive
+a window scrolls up because point below the window end, the new start
+position is chosen to put point @var{f} parts of the window height
+from the bottom. Thus, larger @var{f} means more aggressive
scrolling. The default value, @code{nil}, is equivalent to 0.5.
Likewise, @code{scroll-down-aggressively} is used for scrolling
-down. The value specifies how far point should be placed from the
-bottom of the window; thus, as with @code{scroll-up-aggressively}, a
-larger value is more aggressive.
+down. The value specifies how far point should be placed from the top
+of the window; thus, as with @code{scroll-up-aggressively}, a larger
+value is more aggressive.
@vindex scroll-margin
The variable @code{scroll-margin} restricts how close point can come