aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-11-07 22:04:08 -0500
committerJustin M. Keyes <justinkz@gmail.com>2015-11-07 22:04:08 -0500
commit333bd8cde30ce8125e2ce0454361239893516c56 (patch)
treee009c35bfaa7d6924689ab3cac27ff58391d7a73 /runtime/doc
parent7521fb56558a146f3b116bcf195cf6bd1984d6c2 (diff)
parent975a610233e05772d9c835caeede4b7ae2e1af7d (diff)
downloadrneovim-333bd8cde30ce8125e2ce0454361239893516c56.tar.gz
rneovim-333bd8cde30ce8125e2ce0454361239893516c56.tar.bz2
rneovim-333bd8cde30ce8125e2ce0454361239893516c56.zip
Merge pull request #3628 from mhinz/vim-patch-f2571c6
vim-patch:f2571c6
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--runtime/doc/insert.txt10
-rw-r--r--runtime/doc/motion.txt4
3 files changed, 11 insertions, 5 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 44a08909db..5ed2ca6016 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2962,6 +2962,8 @@ extend({expr1}, {expr2} [, {expr3}]) *extend()*
{expr1} is changed when {expr2} is not empty. If necessary
make a copy of {expr1} first.
{expr2} remains unchanged.
+ When {expr1} is locked and {expr2} is not empty the operation
+ fails.
Returns {expr1}.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index a48ad0185d..013eb6b97b 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.4. Last change: 2014 Aug 04
+*insert.txt* For Vim version 7.4. Last change: 2015 May 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -77,9 +77,11 @@ CTRL-W Delete the word before the cursor (see |i_backspacing| about
joining lines). See the section "word motions",
|word-motions|, for the definition of a word.
*i_CTRL-U*
-CTRL-U Delete all entered characters in the current line (see
- |i_backspacing| about joining lines).
-
+CTRL-U Delete all entered characters before the cursor in the current
+ line. If there are no newly entereed characters and
+ 'backspace'is not empty, delete all characters before the
+ cursor in the current line.
+ See |i_backspacing| about joining lines.
*i_CTRL-I* *i_<Tab>* *i_Tab*
<Tab> or CTRL-I Insert a tab. If the 'expandtab' option is on, the
equivalent number of spaces is inserted (use CTRL-V <Tab> to
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 5e3fe715ab..7f84f2d2a3 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt* For Vim version 7.4. Last change: 2014 Feb 11
+*motion.txt* For Vim version 7.4. Last change: 2015 Jun 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -171,6 +171,8 @@ CTRL-H or *CTRL-H* *<BS>*
l or *l*
<Right> or *<Right>* *<Space>*
<Space> [count] characters to the right. |exclusive| motion.
+ See the 'whichwrap' option for adjusting the behavior
+ at end of line
*0*
0 To the first character of the line. |exclusive|