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 c9957d2991141c2fe95c26ccb1eaddbf11805fc8..8e039421e30f88e98078dc25412c9eade395f3c0 100644 (file)
--- 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 9774bc0e292b4c6dfd8b80060f83fec5cbd679ba..85d06ff89f023d2dc0f0442e9f3be5a8c2df33fb 100644 (file)
--- 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.