From a162959e48173bd77707a8f4beac65b28eaa2f78 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 29 Apr 2012 23:51:44 -0700 Subject: [PATCH] Tweak page break in display.texi * doc/emacs/display.texi (Auto Scrolling): Reword to avoid repetition and improve page break. --- doc/emacs/ChangeLog | 7 ++++++- doc/emacs/display.texi | 9 +++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 91f50958920..ecc6aa50ef9 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2012-04-30 Glenn Morris + + * display.texi (Auto Scrolling): + Reword to avoid repetition and improve page break. + 2012-04-28 Glenn Morris * 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 84e81f565cc..de5e8df9dc5 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. -- 2.11.4.GIT