aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-12 11:33:14 +0300
committerEli Zaretskii2013-07-12 11:33:14 +0300
commitc544322e3ec57461f0090fc6f1991f460656b8e9 (patch)
tree999e49a4add73b8477ebb4546e1983e57347f46a /lisp
parent48dde4df64a89fd9a54fbb9f153319b4f7705c0b (diff)
downloademacs-c544322e3ec57461f0090fc6f1991f460656b8e9.tar.gz
emacs-c544322e3ec57461f0090fc6f1991f460656b8e9.zip
Fix bug #14842 with doc strings of next-line and previous-line.
lisp/simple.el (next-line, previous-line): Document TRY-VSCROLL.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el8
2 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9957d29911..8e039421e30 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-07-12 Eli Zaretskii <eliz@gnu.org>
2
3 * simple.el (next-line, previous-line): Document TRY-VSCROLL.
4 (Bug#14842)
5
12013-07-12 Glenn Morris <rgm@gnu.org> 62013-07-12 Glenn Morris <rgm@gnu.org>
2 7
3 * doc-view.el: Require cl-lib at runtime too. 8 * 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.")
4602(defun next-line (&optional arg try-vscroll) 4602(defun next-line (&optional arg try-vscroll)
4603 "Move cursor vertically down ARG lines. 4603 "Move cursor vertically down ARG lines.
4604Interactively, vscroll tall lines if `auto-window-vscroll' is enabled. 4604Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
4605Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
4606lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
4607function will not vscroll.
4608
4605If there is no character in the target line exactly under the current column, 4609If there is no character in the target line exactly under the current column,
4606the cursor is positioned after the character in that line which spans this 4610the cursor is positioned after the character in that line which spans this
4607column, or at the end of the line if it is not long enough. 4611column, 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.)."
4646(defun previous-line (&optional arg try-vscroll) 4650(defun previous-line (&optional arg try-vscroll)
4647 "Move cursor vertically up ARG lines. 4651 "Move cursor vertically up ARG lines.
4648Interactively, vscroll tall lines if `auto-window-vscroll' is enabled. 4652Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
4653Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
4654lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
4655function will not vscroll.
4656
4649If there is no character in the target line exactly over the current column, 4657If there is no character in the target line exactly over the current column,
4650the cursor is positioned after the character in that line which spans this 4658the cursor is positioned after the character in that line which spans this
4651column, or at the end of the line if it is not long enough. 4659column, or at the end of the line if it is not long enough.