Mercurial > vim

comparison src/testdir/test_diffmode.vim @ 23895:e313b6ee2d9c v8.2.2490

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2490: 'wrap' option is always reset when starting diff mode Commit: https://github.com/vim/vim/commit/4223d43c0fb6ead1e611e4469a1680a9228b6015 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 10 13:18:17 2021 +0100 patch 8.2.2490: 'wrap' option is always reset when starting diff mode Problem: 'wrap' option is always reset when starting diff mode. Solution: Add the "followwrap" item in 'diffopt'. (Rick Howe, closes https://github.com/vim/vim/issues/7797)
author Bram Moolenaar <Bram@vim.org>
date Wed, 10 Feb 2021 13:30:03 +0100
parents f74978697fb6
children f51ea1b6d512
comparison
equal deleted inserted replaced
23894:543007252974 23895:e313b6ee2d9c
1043 call assert_equal(1, &diff) 1043 call assert_equal(1, &diff)
1044 diffoff! 1044 diffoff!
1045 enew! 1045 enew!
1046 endfunc 1046 endfunc
1047 1047
1048 func Test_diff_followwrap()
1049 new
1050 set diffopt+=followwrap
1051 set wrap
1052 diffthis
1053 call assert_equal(1, &wrap)
1054 diffoff
1055 set nowrap
1056 diffthis
1057 call assert_equal(0, &wrap)
1058 diffoff
1059 set diffopt&
1060 bwipe!
1061 endfunc
1062
1048 func Test_diff_maintains_change_mark() 1063 func Test_diff_maintains_change_mark()
1049 enew! 1064 enew!
1050 call setline(1, ['a', 'b', 'c', 'd']) 1065 call setline(1, ['a', 'b', 'c', 'd'])
1051 diffthis 1066 diffthis
1052 new 1067 new