aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authordundargoc <33953936+dundargoc@users.noreply.github.com>2022-05-28 10:42:56 +0200
committerGitHub <noreply@github.com>2022-05-28 16:42:56 +0800
commit1b235fe6cab237e3cb78a44ee82ab79a85370f98 (patch)
tree2682fc3ddb201fc3013086b878c596ce9f74be6f /runtime/doc/vim_diff.txt
parent77d9c672f82d260dc5421519a2f78ed1acc95d6a (diff)
downloadrneovim-1b235fe6cab237e3cb78a44ee82ab79a85370f98.tar.gz
rneovim-1b235fe6cab237e3cb78a44ee82ab79a85370f98.tar.bz2
rneovim-1b235fe6cab237e3cb78a44ee82ab79a85370f98.zip
docs(options): move all removed options to vim_diff.txt (#18770)
It's more consistent to gather all removed options in one spot rather than spreading it out.
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 85b44e3b51..c079b83c29 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -528,6 +528,9 @@ Highlight groups:
Options:
'antialias'
+ *'balloondelay'* *'bdlay'*
+ *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'*
+ *'balloonexpr'* *'bexpr'*
'bioskey' (MS-DOS)
'conskey' (MS-DOS)
*'cp'* *'nocompatible'* *'nocp'* *'compatible'* (Nvim is always "nocompatible".)
@@ -551,9 +554,12 @@ Options:
nnoremap <Esc> i
<
*'macatsui'*
+ *'maxcombine'* *'mco'*
+ Nvim always displays up to 6 combining characters. You can still edit
+ text with more than 6 combining characters, you just can't see them.
+ Use |g8| or |ga|. See |mbyte-combining|.
'maxmem' Nvim delegates memory-management to the OS.
'maxmemtot' Nvim delegates memory-management to the OS.
- 'maxcombine' (6 is always used)
*'prompt'* *'noprompt'*
*'remap'* *'noremap'*
*'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
@@ -567,10 +573,10 @@ Options:
*'toolbar'* *'tb'*
*'toolbariconsize'* *'tbis'*
*'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
+ *'ttyfast'* *'tf'* *'nottyfast'* *'notf'*
*'ttymouse'* *'ttym'*
*'ttyscroll'* *'tsl'*
*'ttytype'* *'tty'*
- 'ttyfast'
'weirdinvert'
Startup: