From: Noam Postavsky <npostavs@gmail.com>
Date: Mon, 29 Jan 2018 23:49:46 +0000 (-0500)
Subject: Fix scroll-margin docstring (Bug#13791)
X-Git-Tag: emacs-26.1-rc1~280
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db6564cde0a9001311c38600d61f503e9d32bf0b;p=emacs.git

Fix scroll-margin docstring (Bug#13791)

* src/xdisp.c (syms_of_xdisp) <scroll-margin>: Explain that entering
the margin may trigger any sort of auto scrolling, not recentering
specifically.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 903815c6581..7511e54ab1d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -32527,8 +32527,8 @@ A value of zero means always recenter point if it moves off screen.  */);
 
   DEFVAR_INT ("scroll-margin", scroll_margin,
     doc: /* Number of lines of margin at the top and bottom of a window.
-Recenter the window whenever point gets within this many lines
-of the top or bottom of the window.  */);
+Trigger automatic scrolling whenever point gets within this many lines
+of the top or bottom of the window (see info node `Auto Scrolling').  */);
   scroll_margin = 0;
 
   DEFVAR_LISP ("maximum-scroll-margin", Vmaximum_scroll_margin,