From 6fdebe937101d3a09a9f95f5c3470b8bf7812b5e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Dec 2011 15:32:29 +0200 Subject: [PATCH] Minor doc fixes in doc/emacs/display.texi. doc/emacs/display.texi (Auto Scrolling): More accurate description of what scroll-*-aggressively does, including the effect of non-zero margin. Fix "i.e." markup. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/display.texi | 32 +++++++++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d7bcb28b500..5c3699a8098 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-12-03 Eli Zaretskii + + * display.texi (Auto Scrolling): More accurate description of what + scroll-*-aggressively does, including the effect of non-zero + margin. Fix "i.e." markup. + 2011-12-02 Chong Yidong * text.texi (Pages): Mention how formfeed chars are displayed. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 88b2758828e..9d928d02452 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -238,26 +238,32 @@ centered after scrolling. @cindex aggressive scrolling @vindex scroll-up-aggressively @vindex scroll-down-aggressively - When the window does scroll by a longer distance, you can control -how aggressively it scrolls by setting the variables -@code{scroll-up-aggressively} and @code{scroll-down-aggressively}. -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, -i.e. forward. When point goes off 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: more new text is brought into view. The default value, -@code{nil}, is equivalent to 0.5. + When the window does scroll by a distance longer than +@code{scroll-step}, you can control how aggressively it scrolls by +setting the variables @code{scroll-up-aggressively} and +@code{scroll-down-aggressively}. 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, i.e.@: forward. When point +goes off the window end, the new start position is chosen to put point +@var{f} parts of the window height from the bottom margin. Thus, +larger @var{f} means more aggressive scrolling: more new text is +brought into view. The default value, @code{nil}, is equivalent to +0.5. Likewise, @code{scroll-down-aggressively} is used for scrolling -down, i.e. backward. The value specifies how far point should be -placed from the top of the window; thus, as with +down, i.e.@: backward. The value specifies how far point should be +placed from the top margin of the window; thus, as with @code{scroll-up-aggressively}, a larger value is more aggressive. These two variables are ignored if either @code{scroll-step} or @code{scroll-conservatively} are set to a non-zero value. + Note that @code{scroll-margin}, described below, limits the amount +of scrolling so as to put point outside of the top or bottom margin, +even if aggressive scrolling specifies a fraction @var{f} that is +larger than the window portion between the top and the bottom margins. + @vindex scroll-margin The variable @code{scroll-margin} restricts how close point can come to the top or bottom of a window. Its value is a number of screen -- 2.39.2