thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2490: 'wrap' option is always reset when starting diff mode

Browse Source 
Problem:    'wrap' option is always reset when starting diff mode.
Solution:   Add the "followwrap" item in 'diffopt'. (Rick Howe, closes #7797)
This commit is contained in:
Bram Moolenaar
2021-02-10 13:18:17 +01:00
parent 963ffa0a5a
commit 4223d43c0f
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/diff.txt
View File

@@ -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

2
runtime/doc/options.txt
View File

@@ -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