aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-01 17:04:25 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-08-01 22:26:04 +0200
commita14fc7b159dcc0f39e8aff68763dff92cb364d18 (patch)
tree33e56b08cae4bc1c14f3f0b137bd36b92d5f15e9 /runtime/doc
parent47b4eb110da8dfab1fca51ce4cc68b224d85b966 (diff)
downloadrneovim-a14fc7b159dcc0f39e8aff68763dff92cb364d18.tar.gz
rneovim-a14fc7b159dcc0f39e8aff68763dff92cb364d18.tar.bz2
rneovim-a14fc7b159dcc0f39e8aff68763dff92cb364d18.zip
vim-patch:f6b401090e81
Update runtime files https://github.com/vim/vim/commit/f6b401090e816b4216f783a9b85d21d9ad134ff8
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/eval.txt8
-rw-r--r--runtime/doc/indent.txt5
-rw-r--r--runtime/doc/index.txt25
-rw-r--r--runtime/doc/options.txt3
-rw-r--r--runtime/doc/pattern.txt2
-rw-r--r--runtime/doc/visual.txt2
6 files changed, 40 insertions, 5 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index cfc183ec42..aa7e58acc4 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2576,9 +2576,9 @@ assert_false({actual} [, {msg}]) *assert_false()*
"Expected False but got {actual}" is produced.
assert_inrange({lower}, {upper}, {actual} [, {msg}]) *assert_inrange()*
- This asserts number values. When {actual} is lower than
- {lower} or higher than {upper} an error message is added to
- |v:errors|.
+ This asserts number and |Float| values. When {actual} is lower
+ than {lower} or higher than {upper} an error message is added
+ to |v:errors|. Also see |assert-return|.
When {msg} is omitted an error in the form
"Expected range {lower} - {upper}, but got {actual}" is
produced.
@@ -4631,7 +4631,7 @@ gettabinfo([{arg}]) *gettabinfo()*
tabnr tab page number.
variables a reference to the dictionary with
tabpage-local variables
- windows List of |window-ID|s in the tag page.
+ windows List of |window-ID|s in the tab page.
gettabvar({tabnr}, {varname} [, {def}]) *gettabvar()*
Get the value of a tab-local variable {varname} in tab page
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 721aa93442..e69497e1ab 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -944,6 +944,11 @@ can sometimes be slow, thus it timeouts after 150 msec. If you notice the
indenting isn't correct, you can set a larger timeout in msec: >
let g:pyindent_searchpair_timeout = 500
+If looking back for unclosed parenthesis is still too slow, especially during
+a copy-paste operation, or if you don't need indenting inside multi-line
+parentheses, you can completely disable this feature: >
+ let g:pyindent_disable_parentheses_indenting = 1
+
R *ft-r-indent*
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 03523042c6..305d5be404 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -155,6 +155,20 @@ commands in CTRL-X submode *i_CTRL-X_index*
|i_CTRL-X_s| CTRL-X s spelling suggestions
{not available when compiled without the |+insert_expand| feature}
+commands in completion mode (see |popupmenu-keys|)
+
+|complete_CTRL-E| CTRL-E stop completion and go back to original text
+|complete_CTRL-Y| CTRL-Y accept selected match and stop completion
+ CTRL-L insert one character from the current match
+ <CR> insert currently selected match
+ <BS> delete one character and redo search
+ CTRL-H same as <BS>
+ <Up> select the previous match
+ <Down> select the next match
+ <PageUp> select a match several entries back
+ <PageDown> select a match several entries forward
+ other stop completion and insert the typed character
+
==============================================================================
2. Normal mode *normal-index*
@@ -840,6 +854,17 @@ tag char note action in Normal mode ~
|z<Right>| z<Right> same as "zl"
==============================================================================
+2.6 Operator-pending mode *operator-pending-index*
+
+These can be used after an operator, but before a {motion} has been entered.
+
+tag char action in Insert mode ~
+-----------------------------------------------------------------------
+|o_v| v force operator to work characterwise
+|o_V| V force operator to work linewise
+|o_CTRL-V| CTRL-V force operator to work blockwise
+
+==============================================================================
3. Visual mode *visual-index*
Most commands in Visual mode are the same as in Normal mode. The ones listed
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d0ead3c256..a94bbc5599 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1880,6 +1880,9 @@ A jump table for the options with a short description can be found at |Q_op|.
context:{n} Use a context of {n} lines between a change
and a fold that contains unchanged lines.
When omitted a context of six lines is used.
+ When using zero the context is actually one,
+ since folds require a line in between, also
+ for a deleted line.
See |fold-diff|.
iblank Ignore changes where lines are all blank. Adds
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 9e68bb8af1..7f6a74e3f6 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1201,7 +1201,7 @@ x A single character, with no special meaning, matches itself
\%u20AC Matches the character specified with up to four hexadecimal
characters.
\%U1234abcd Matches the character specified with up to eight hexadecimal
- characters.
+ characters, up to 0x7fffffff
==============================================================================
7. Ignoring case in a pattern */ignorecase*
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 252a1ca8b8..4f29577680 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -103,6 +103,8 @@ gn Search forward for the last used search pattern, like
E.g., "dgn" deletes the text of the next match.
If Visual mode is active, extends the selection
until the end of the next match.
+ Note: Unlinke `n` the search direction does not depend
+ on the previous search command.
*gN* *v_gN*
gN Like |gn| but searches backward, like with `N`.