diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-02-10 20:56:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 20:56:54 -0500 |
| commit | 1aec5ba85e97889c792253424c5de9c12ddd6cf4 (patch) | |
| tree | 62c78074f611cb812eb630f6e1c88eeabeae06bd /runtime | |
| parent | 61aea004d7101e138794a337c03ef00a6b3994e6 (diff) | |
| parent | 81b4c881302640747de39f805312966c541acc47 (diff) | |
| download | rneovim-1aec5ba85e97889c792253424c5de9c12ddd6cf4.tar.gz rneovim-1aec5ba85e97889c792253424c5de9c12ddd6cf4.tar.bz2 rneovim-1aec5ba85e97889c792253424c5de9c12ddd6cf4.zip | |
Merge pull request #13908 from janlazo/vim-8.2.2489
vim-patch:8.1.0341,8.2.{2489,2490,2492,2495,2496}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/diff.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 2a972483ff..3544882ceb 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -48,7 +48,7 @@ In each of the edited files these options are set: 'scrollbind' on 'cursorbind' on 'scrollopt' includes "hor" - 'wrap' off + 'wrap' off, or leave as-is if 'diffopt' includes "followwrap" 'foldmethod' "diff" 'foldcolumn' value from 'diffopt', default is 2 @@ -132,7 +132,7 @@ Otherwise they are set to their default value: 'scrollbind' off 'cursorbind' off 'scrollopt' without "hor" - 'wrap' on + 'wrap' on, or leave as-is if 'diffopt' includes "followwrap" 'foldmethod' "manual" 'foldcolumn' 0 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 98e2d50f1d..ce3788e0fc 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1971,6 +1971,8 @@ A jump table for the options with a short description can be found at |Q_op|. foldcolumn:{n} Set the 'foldcolumn' option to {n} when starting diff mode. Without this 2 is used. + followwrap Follow the 'wrap' option and leave as it is. + internal Use the internal diff library. This is ignored when 'diffexpr' is set. *E960* When running out of memory when writing a |