[Emacs-diffs] trunk r113387: Fix bug #14842 with doc strings of next-line and previous-line.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113387
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14842
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-07-12 11:33:14 +0300
message:
  Fix bug #14842 with doc strings of next-line and previous-line.
  
   lisp/simple.el (next-line, previous-line): Document TRY-VSCROLL.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-12 03:54:57 +0000
+++ b/lisp/ChangeLog    2013-07-12 08:33:14 +0000
@@ -1,3 +1,8 @@
+2013-07-12  Eli Zaretskii  <address@hidden>
+
+       * simple.el (next-line, previous-line): Document TRY-VSCROLL.
+       (Bug#14842)
+
 2013-07-12  Glenn Morris  <address@hidden>
 
        * doc-view.el: Require cl-lib at runtime too.

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-07-10 16:18:17 +0000
+++ b/lisp/simple.el    2013-07-12 08:33:14 +0000
@@ -4602,6 +4602,10 @@
 (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 @@
 (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.