diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 7 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 91f5095892..ecc6aa50ef 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2012-04-30 Glenn Morris <[email protected]> + + * display.texi (Auto Scrolling): + Reword to avoid repetition and improve page break. + 2012-04-28 Glenn Morris <[email protected]> * xresources.texi (Resources): @@ -9225,7 +9230,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 84e81f565c..de5e8df9dc 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -260,14 +260,11 @@ placed from the top margin of the window; thus, as with 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 +to the top or bottom of a window (even if aggressive scrolling +specifies a fraction @var{f} that is larger than the window portion +between the top and the bottom margins). Its value is a number of screen lines; if point comes within that many lines of the top or bottom of the window, Emacs performs automatic scrolling. By default, @code{scroll-margin} is 0. |