From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 12 Jul 2013 08:33:14 +0000 (+0300)
Subject: Fix bug #14842 with doc strings of next-line and previous-line.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1826
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c544322e3ec57461f0090fc6f1991f460656b8e9;p=emacs.git

Fix bug #14842 with doc strings of next-line and previous-line.

 lisp/simple.el (next-line, previous-line): Document TRY-VSCROLL.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9957d29911..8e039421e30 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* simple.el (next-line, previous-line): Document TRY-VSCROLL.
+	(Bug#14842)
+
 2013-07-12  Glenn Morris  <rgm@gnu.org>
 
 	* doc-view.el: Require cl-lib at runtime too.
diff --git a/lisp/simple.el b/lisp/simple.el
index 9774bc0e292..85d06ff89f0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4602,6 +4602,10 @@ for it.")
 (defun next-line (&optional arg try-vscroll)
   "Move cursor vertically down ARG lines.
 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
+Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
+lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
+function will not vscroll.
+
 If there is no character in the target line exactly under the current column,
 the cursor is positioned after the character in that line which spans this
 column, or at the end of the line if it is not long enough.
@@ -4646,6 +4650,10 @@ and more reliable (no dependence on goal column, etc.)."
 (defun previous-line (&optional arg try-vscroll)
   "Move cursor vertically up ARG lines.
 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
+Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
+lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
+function will not vscroll.
+
 If there is no character in the target line exactly over the current column,
 the cursor is positioned after the character in that line which spans this
 column, or at the end of the line if it is not long enough.