aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-12 11:35:42 +0300
committerEli Zaretskii2013-07-12 11:35:42 +0300
commit18331b9040f8bf5a7d370c17cd32cf1d5a7a5d80 (patch)
tree02f7a9d7ae02a60c39a5d6be7de7a7fbba4885fd
parentc544322e3ec57461f0090fc6f1991f460656b8e9 (diff)
downloademacs-18331b9040f8bf5a7d370c17cd32cf1d5a7a5d80.tar.gz
emacs-18331b9040f8bf5a7d370c17cd32cf1d5a7a5d80.zip
Minor followup to previous commit.
lisp/simple.el (next-line, previous-line): Document TRY-VSCROLL and ARG. Fixes: debbugs:14842
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e039421e30..99e9150cd7b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
12013-07-12 Eli Zaretskii <eliz@gnu.org> 12013-07-12 Eli Zaretskii <eliz@gnu.org>
2 2
3 * simple.el (next-line, previous-line): Document TRY-VSCROLL. 3 * simple.el (next-line, previous-line): Document TRY-VSCROLL and ARG.
4 (Bug#14842) 4 (Bug#14842)
5 5
62013-07-12 Glenn Morris <rgm@gnu.org> 62013-07-12 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/simple.el b/lisp/simple.el
index 85d06ff89f0..9158452fd64 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4606,6 +4606,8 @@ Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
4606lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this 4606lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
4607function will not vscroll. 4607function will not vscroll.
4608 4608
4609ARG defaults to 1.
4610
4609If there is no character in the target line exactly under the current column, 4611If there is no character in the target line exactly under the current column,
4610the cursor is positioned after the character in that line which spans this 4612the cursor is positioned after the character in that line which spans this
4611column, or at the end of the line if it is not long enough. 4613column, or at the end of the line if it is not long enough.
@@ -4654,6 +4656,8 @@ Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
4654lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this 4656lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
4655function will not vscroll. 4657function will not vscroll.
4656 4658
4659ARG defaults to 1.
4660
4657If there is no character in the target line exactly over the current column, 4661If there is no character in the target line exactly over the current column,
4658the cursor is positioned after the character in that line which spans this 4662the cursor is positioned after the character in that line which spans this
4659column, or at the end of the line if it is not long enough. 4663column, or at the end of the line if it is not long enough.