diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-05-28 10:42:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 16:42:56 +0800 |
| commit | 1b235fe6cab237e3cb78a44ee82ab79a85370f98 (patch) | |
| tree | 2682fc3ddb201fc3013086b878c596ce9f74be6f | |
| parent | 77d9c672f82d260dc5421519a2f78ed1acc95d6a (diff) | |
| download | rneovim-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.
| -rw-r--r-- | runtime/doc/options.txt | 18 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 10 |
2 files changed, 8 insertions, 20 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 73755e55cc..a21d3bbce7 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -927,15 +927,6 @@ A jump table for the options with a short description can be found at |Q_op|. backup would be made by renaming the original file crontab won't see the newly created file). Also see 'backupcopy' and |crontab|. - *'balloondelay'* *'bdlay'* -'balloondelay' 'bdlay' Removed. - - *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'* -'ballooneval' 'beval' Removed. - - *'balloonexpr'* *'bexpr'* -'balloonexpr' 'bexpr' Removed. - *'belloff'* *'bo'* 'belloff' 'bo' string (default "all") global @@ -3928,12 +3919,6 @@ A jump table for the options with a short description can be found at |Q_op|. set. Note that this is not in milliseconds, like other options that set a time. This is to be compatible with Nvi. - *'maxcombine'* *'mco'* -'maxcombine' 'mco' Removed. |vim-differences| - 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|. - *'maxfuncdepth'* *'mfd'* 'maxfuncdepth' 'mfd' number (default 100) global @@ -6570,9 +6555,6 @@ A jump table for the options with a short description can be found at |Q_op|. NOTE: Use of special characters in 'titlestring' may cause the display to be garbled (e.g., when it contains a CR or NL character). - *'ttyfast'* *'tf'* *'nottyfast'* *'notf'* -'ttyfast' 'tf' Removed. |vim-differences| - *'undodir'* *'udir'* *E5003* 'undodir' 'udir' string (default "$XDG_STATE_HOME/nvim/undo//") global 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: |