mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-10 16:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1072: extending sign and foldcolumn below the text is confusing (#9816)

Browse Source 
Problem:    Extending sign and foldcolumn below the text is confusing.
Solution:   Let the sign and foldcolumn stop at the last text line, just like
            the line number column.  Also stop the command line window leader.
            (Christian Brabandt)

8ee4c01b8c

Closes https://github.com/neovim/neovim/issues/9613
This commit is contained in:
Marco Hinz
2019-04-03 10:48:47 +02:00
committed by GitHub
parent c395cf018d
commit d9de4c0efb
6 changed files with 387 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

408
test/functional/ui/diff_spec.lua
View File

@@ -62,12 +62,12 @@ describe('Diff mode screen', function()
{1: }5 {3:│}{1: }5 |
{1: }6 {3:│}{1: }6 |
{1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -82,12 +82,12 @@ describe('Diff mode screen', function()
{1: }5 {3:│}{1: }5 |
{1: }6 {3:│}{1: }6 |
{1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -108,12 +108,12 @@ describe('Diff mode screen', function()
{1: }5 {3:│}{1: }5 |
{1: }6 {3:│}{1: }6 |
{1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -128,12 +128,12 @@ describe('Diff mode screen', function()
{1: }5 {3:│}{1: }5 |
{1: }6 {3:│}{1: }6 |
{1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -154,12 +154,12 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{2:------------------}{3:│}{1: }{4:11 }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -174,12 +174,12 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{2:------------------}{3:│}{1: }{4:11 }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -200,12 +200,12 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{4:11 }{3:│}{1: }{2:-----------------}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -220,12 +220,12 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{4:11 }{3:│}{1: }{2:-----------------}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -250,8 +250,8 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{4:11 }{3:│}{1: }{2:-----------------}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -270,8 +270,8 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{4:11 }{3:│}{1: }{2:-----------------}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -296,8 +296,8 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{2:------------------}{3:│}{1: }{4:11 }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -316,8 +316,8 @@ describe('Diff mode screen', function()
{1: }9 {3:│}{1: }9 |
{1: }10 {3:│}{1: }10 |
{1: }{2:------------------}{3:│}{1: }{4:11 }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -546,11 +546,11 @@ int main(int argc, char **argv)
{1: }{2:------------------}{3:│}{1: }{4: values.each do }|
{1: } v.finalize {3:│}{1: } v.finalize |
{1: } end {3:│}{1: } end |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=internal,filler |
]])
@@ -569,11 +569,11 @@ int main(int argc, char **argv)
{1: } values.each do |{3:│}{1: } values.each do |
{1: } v.finalize {3:│}{1: } v.finalize |
{1: } end {3:│}{1: } end |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
|
]])
@@ -593,11 +593,11 @@ int main(int argc, char **argv)
{1: } values.each do |{3:│}{1: } values.each do |
{1: } v.finalize {3:│}{1: } v.finalize |
{1: } end {3:│}{1: } end |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])
@@ -612,19 +612,19 @@ int main(int argc, char **argv)
feed(':set diffopt=filler<cr>')
screen:expect([[
{1:+ }{5:^+-- 10 lines: 1···}{3:│}{1:+ }{5:+-- 10 lines: 1··}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -632,19 +632,19 @@ int main(int argc, char **argv)
feed(':set diffopt+=internal<cr>')
screen:expect([[
{1:+ }{5:^+-- 10 lines: 1···}{3:│}{1:+ }{5:+-- 10 lines: 1··}|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -658,19 +658,19 @@ int main(int argc, char **argv)
feed(':set diffopt=filler<cr>')
screen:expect([[
{1:- }^ {3:│}{1:- } |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
@@ -678,19 +678,19 @@ int main(int argc, char **argv)
feed(':set diffopt+=internal<cr>')
screen:expect([[
{1:- }^ {3:│}{1:- } |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -706,17 +706,17 @@ int main(int argc, char **argv)
{1: }^a {3:│}{1: }A |
{1: }b {3:│}{1: }b |
{1: }{9:cd }{3:│}{1: }{9:cD}{8:e}{9: }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler,icase |
]])
@@ -726,17 +726,17 @@ int main(int argc, char **argv)
{1: }^a {3:│}{1: }A |
{1: }b {3:│}{1: }b |
{1: }{9:cd }{3:│}{1: }{9:cD}{8:e}{9: }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -763,12 +763,12 @@ int main(int argc, char **argv)
{1: } return 0; {3:│}{1: } return 0; |
{1: }{2:------------------}{3:│}{1: }{4: } }|
{1: }} {3:│}{1: }} |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler,iwhite |
]])
@@ -786,12 +786,12 @@ int main(int argc, char **argv)
{1: } return 0; {3:│}{1: } return 0; |
{1: }{2:------------------}{3:│}{1: }{4: } }|
{1: }} {3:│}{1: }} |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler,iwhite,internal |
]])
@@ -815,14 +815,14 @@ int main(int argc, char **argv)
{1: }cd {3:│}{1: }cd |
{1: }ef {3:│}{1: } |
{1: }{8:xxx}{9: }{3:│}{1: }ef |
{1: }{6:~ }{3:│}{1: }{8:yyy}{9: }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{1: }{8:yyy}{9: }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=internal,filler,iblank |
]])
@@ -838,15 +838,15 @@ int main(int argc, char **argv)
{1: } {3:│}{1: } |
{1: }cd {3:│}{1: }ef |
{1: }ef {3:│}{1: }{8:yyy}{9: }|
{1: }{8:xxx}{9: }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{8:xxx}{9: }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])
@@ -862,15 +862,15 @@ int main(int argc, char **argv)
{1: } {3:│}{1: } |
{1: }cd {3:│}{1: }ef |
{1: }ef {3:│}{1: }{8:yyy}{9: }|
{1: }{8:xxx}{9: }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{8:xxx}{9: }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])
@@ -886,15 +886,15 @@ int main(int argc, char **argv)
{1: } {3:│}{1: } |
{1: }cd {3:│}{1: }ef |
{1: }ef {3:│}{1: }{8:yyy}{9: }|
{1: }{8:xxx}{9: }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{8:xxx}{9: }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])
@@ -921,12 +921,12 @@ int main(int argc, char **argv)
{1: }foo {3:│}{1: }foo |
{1: }{2:------------------}{3:│}{1: }{4: }|
{1: }bar {3:│}{1: }bar |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])
@@ -945,12 +945,12 @@ int main(int argc, char **argv)
{1: }foo {3:│}{1: }foo |
{1: }{2:------------------}{3:│}{1: }{4: }|
{1: }bar {3:│}{1: }bar |
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{1: }{6:~ }{3:│}{1: }{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
: |
]])