diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-10 13:18:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-10 13:18:17 +0100 |
| commit | 4223d43c0fb6ead1e611e4469a1680a9228b6015 (patch) | |
| tree | 0eb28a94ec186e4f0306f6aaae79743bd6e9b99d /runtime | |
| parent | 963ffa0a5a6091655ed72b4590ec5d5a1653bce8 (diff) | |
patch 8.2.2490: 'wrap' option is always reset when starting diff modev8.2.2490
Problem: 'wrap' option is always reset when starting diff mode.
Solution: Add the "followwrap" item in 'diffopt'. (Rick Howe, closes #7797)
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 0b4edb9276..566411a1f7 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -59,7 +59,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 @@ -144,7 +144,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 74bab429c5..f25b1ba977 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2677,6 +2677,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 |