diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/mbyte.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 14 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 |
3 files changed, 6 insertions, 12 deletions
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 2d4a20ed72..d38c4fd019 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1059,8 +1059,7 @@ widespread as file format. A composing or combining character is used to change the meaning of the character before it. The combining characters are drawn on top of the preceding character. -Up to two combining characters can be used by default. This can be changed -with the 'maxcombine' option. +Up to six combining characters can be displayed. When editing text a composing character is mostly considered part of the preceding character. For example "x" will delete a character and its following composing characters by default. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 7ff1281274..3bc248c795 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3888,16 +3888,10 @@ A jump table for the options with a short description can be found at |Q_op|. set a time. This is to be compatible with Nvi. *'maxcombine'* *'mco'* -'maxcombine' 'mco' number (default 2) - global - {only available when compiled with the |+multi_byte| - feature} - The maximum number of combining characters supported for displaying. - The default is OK for most languages. Hebrew may require 4. - Maximum value is 6. - Even when this option is set to 2 you can still edit text with more - combining characters, you just can't see them. Use |g8| or |ga|. - See |mbyte-combining|. +'maxcombine' 'mco' Removed. |vim-differences| {Nvim} + 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) diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 1af91f24da..9dd03079fe 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -409,6 +409,7 @@ Options: *'macatsui'* 'maxmem' Nvim delegates memory-management to the OS. 'maxmemtot' Nvim delegates memory-management to the OS. + 'maxcombine' (6 is always used) *'restorescreen'* *'rs'* *'norestorescreen'* *'nors'* 'shelltype' *'shortname'* *'sn'* *'noshortname'* *'nosn'* |