aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2022-08-21 23:26:49 -0600
committerJosh Rahm <joshuarahm@gmail.com>2022-08-21 23:26:49 -0600
commit73ede4a508517f8e55c75d710f13851eb8079875 (patch)
treeb4cccc61b70c28b1474d74d2ff4bff856929cdca /runtime/doc/vim_diff.txt
parent8436383af96dc7afa3596fc22c012d68e76f47f8 (diff)
parent72b03792b6428ca96ca779b53061c6c98f6f930f (diff)
downloadrneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.gz
rneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.bz2
rneovim-73ede4a508517f8e55c75d710f13851eb8079875.zip
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 27c953a460..53effa1443 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -207,9 +207,8 @@ Commands:
|:checkhealth|
|:drop| is always available
|:Man| is available by default, with many improvements such as completion
- |:sign-define| accepts a `numhl` argument, to highlight the line number
|:match| can be invoked before highlight group is defined
- |:source| works with Lua and anonymous (no file) scripts
+ |:source| works with Lua
User commands can support |:command-preview| to show results as you type
Events:
@@ -271,7 +270,6 @@ Options:
'signcolumn' supports up to 9 dynamic/fixed columns
'statusline' supports unlimited alignment sections
'tabline' %@Func@foo%X can call any function on mouse-click
- 'wildoptions' "pum" flag to use popupmenu for wildmode completion
'winblend' pseudo-transparency in floating windows |api-floatwin|
'winhighlight' window-local highlights
@@ -373,6 +371,10 @@ Lua interface (|lua.txt|):
Commands:
|:doautocmd| does not warn about "No matching autocommands".
+ |:wincmd| accepts a count.
+
+Command line completion:
+ The meanings of arrow keys do not change depending on 'wildoptions'.
Functions:
|input()| and |inputdialog()| support for each other’s features (return on