aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-05-15 14:53:31 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-05-15 14:53:31 +0200
commit8e052f677ee80414a4ef635afb5ce0f323f602f3 (patch)
treeeec3e95d46c59360f08457cd4cb1f040069d2cae /runtime/doc/vim_diff.txt
parent6e4e70f51b8a889d38fe5d954d9ac817750424c3 (diff)
parent8d8b6224d941567aeefc67beb471aea36b8bdc05 (diff)
downloadrneovim-8e052f677ee80414a4ef635afb5ce0f323f602f3.tar.gz
rneovim-8e052f677ee80414a4ef635afb5ce0f323f602f3.tar.bz2
rneovim-8e052f677ee80414a4ef635afb5ce0f323f602f3.zip
Merge #6737 "options: make 'highlight' read-only"
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 7f456bf473..9a7789c0f5 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -107,8 +107,10 @@ Options:
'cpoptions' flags: |cpo-_|
'guicursor' works in the terminal
'inccommand' shows interactive results for |:substitute|-like commands
+ 'scrollback'
'statusline' supports unlimited alignment sections
'tabline' %@Func@foo%X can call any function on mouse-click
+ 'winhighlight' window-local highlights
Variables:
|v:event|
@@ -291,9 +293,6 @@ MS-DOS support:
'bioskey'
'conskey'
-Highlight groups:
- |hl-VisualNOS|
-
Test functions:
test_alloc_fail()
test_autochdir()
@@ -314,6 +313,7 @@ Other options:
'esckeys'
'guioptions' "t" flag was removed
*'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
+ 'highlight' (the builtin |highlight-groups| cannot be changed)
*'imactivatefunc'* *'imaf'*
*'imactivatekey'* *'imak'*
*'imstatusfunc'* *'imsf'*