refactor(ui)!: link `VertSplit` to `Normal` by default

Avoids using `gui=reverse` on `VertSplit` and makes window separators
look much nicer by default.

1 files changed, 682 insertions, 682 deletions

diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua
index 6f67dea2be..5d056cd6c3 100644
--- a/test/functional/ui/diff_spec.lua
+++ b/test/functional/ui/diff_spec.lua
@@ -57,40 +57,40 @@ describe('Diff mode screen', function()
 
     feed(':set diffopt=filler<cr>')
     screen:expect([[
-      {1:  }{2:------------------}{3:│}{1:  }{4:0                }|
-      {1:  }^1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:+ }{5:+--  4 lines: 7···}{3:│}{1:+ }{5:+--  4 lines: 7··}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }{2:------------------}│{1:  }{4:0                }|
+      {1:  }^1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:+ }{5:+--  4 lines: 7···}│{1:+ }{5:+--  4 lines: 7··}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt=filler                     |
     ]])
 
     feed(':set diffopt+=internal<cr>')
     screen:expect([[
-      {1:  }{2:------------------}{3:│}{1:  }{4:0                }|
-      {1:  }^1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:+ }{5:+--  4 lines: 7···}{3:│}{1:+ }{5:+--  4 lines: 7··}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }{2:------------------}│{1:  }{4:0                }|
+      {1:  }^1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:+ }{5:+--  4 lines: 7···}│{1:+ }{5:+--  4 lines: 7··}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt+=internal                  |
     ]])
@@ -103,40 +103,40 @@ describe('Diff mode screen', function()
 
     feed(":set diffopt=filler<cr>")
     screen:expect([[
-      {1:  }{4:^0                 }{3:│}{1:  }{2:-----------------}|
-      {1:  }1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:+ }{5:+--  4 lines: 7···}{3:│}{1:+ }{5:+--  4 lines: 7··}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }{4:^0                 }│{1:  }{2:-----------------}|
+      {1:  }1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:+ }{5:+--  4 lines: 7···}│{1:+ }{5:+--  4 lines: 7··}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt=filler                     |
     ]])
 
     feed(":set diffopt+=internal<cr>")
     screen:expect([[
-      {1:  }{4:^0                 }{3:│}{1:  }{2:-----------------}|
-      {1:  }1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:+ }{5:+--  4 lines: 7···}{3:│}{1:+ }{5:+--  4 lines: 7··}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }{4:^0                 }│{1:  }{2:-----------------}|
+      {1:  }1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:+ }{5:+--  4 lines: 7···}│{1:+ }{5:+--  4 lines: 7··}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt+=internal                  |
     ]])
@@ -149,53 +149,53 @@ describe('Diff mode screen', function()
 
     feed(":set diffopt=filler<cr>")
     screen:expect([[
-      {1:+ }{5:^+--  4 lines: 1···}{3:│}{1:+ }{5:+--  4 lines: 1··}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{2:------------------}{3:│}{1:  }{4:11               }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:+ }{5:^+--  4 lines: 1···}│{1:+ }{5:+--  4 lines: 1··}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{2:------------------}│{1:  }{4:11               }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt=filler                     |
     ]])
 
     feed(":set diffopt+=internal<cr>")
     screen:expect([[
-      {1:+ }{5:^+--  4 lines: 1···}{3:│}{1:+ }{5:+--  4 lines: 1··}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{2:------------------}{3:│}{1:  }{4:11               }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:+ }{5:^+--  4 lines: 1···}│{1:+ }{5:+--  4 lines: 1··}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{2:------------------}│{1:  }{4:11               }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt+=internal                  |
     ]])
 
     screen:try_resize(40, 9)
     screen:expect([[
-      {1:+ }{5:^+--  4 lines: 1···}{3:│}{1:+ }{5:+--  4 lines: 1··}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
+      {1:+ }{5:^+--  4 lines: 1···}│{1:+ }{5:+--  4 lines: 1··}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
                                               |
     ]])
@@ -208,53 +208,53 @@ describe('Diff mode screen', function()
 
     feed(":set diffopt=filler<cr>")
     screen:expect([[
-      {1:+ }{5:^+--  4 lines: 1···}{3:│}{1:+ }{5:+--  4 lines: 1··}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{4:11                }{3:│}{1:  }{2:-----------------}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:+ }{5:^+--  4 lines: 1···}│{1:+ }{5:+--  4 lines: 1··}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{4:11                }│{1:  }{2:-----------------}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt=filler                     |
     ]])
 
     feed(":set diffopt+=internal<cr>")
     screen:expect([[
-      {1:+ }{5:^+--  4 lines: 1···}{3:│}{1:+ }{5:+--  4 lines: 1··}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{4:11                }{3:│}{1:  }{2:-----------------}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:+ }{5:^+--  4 lines: 1···}│{1:+ }{5:+--  4 lines: 1··}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{4:11                }│{1:  }{2:-----------------}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt+=internal                  |
     ]])
 
     screen:try_resize(40, 9)
     screen:expect([[
-      {1:+ }{5:^+--  4 lines: 1···}{3:│}{1:+ }{5:+--  4 lines: 1··}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
+      {1:+ }{5:^+--  4 lines: 1···}│{1:+ }{5:+--  4 lines: 1··}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
                                               |
     ]])
@@ -267,40 +267,40 @@ describe('Diff mode screen', function()
 
     feed(':set diffopt=filler<cr>')
     screen:expect([[
-      {1:  }^1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }{2:------------------}{3:│}{1:  }{4:4                }|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{4:11                }{3:│}{1:  }{2:-----------------}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }^1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }{2:------------------}│{1:  }{4:4                }|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{4:11                }│{1:  }{2:-----------------}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt=filler                     |
     ]])
 
     feed(':set diffopt+=internal<cr>')
     screen:expect([[
-      {1:  }^1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }{2:------------------}{3:│}{1:  }{4:4                }|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{4:11                }{3:│}{1:  }{2:-----------------}|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }^1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }{2:------------------}│{1:  }{4:4                }|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{4:11                }│{1:  }{2:-----------------}|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt+=internal                  |
     ]])
@@ -313,40 +313,40 @@ describe('Diff mode screen', function()
 
     feed(':set diffopt=filler<cr>')
     screen:expect([[
-      {1:  }^1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }{4:4                 }{3:│}{1:  }{2:-----------------}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{2:------------------}{3:│}{1:  }{4:11               }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }^1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }{4:4                 }│{1:  }{2:-----------------}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{2:------------------}│{1:  }{4:11               }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt=filler                     |
     ]])
 
     feed(':set diffopt+=internal<cr>')
     screen:expect([[
-      {1:  }^1                 {3:│}{1:  }1                |
-      {1:  }2                 {3:│}{1:  }2                |
-      {1:  }3                 {3:│}{1:  }3                |
-      {1:  }4                 {3:│}{1:  }4                |
-      {1:  }{4:4                 }{3:│}{1:  }{2:-----------------}|
-      {1:  }5                 {3:│}{1:  }5                |
-      {1:  }6                 {3:│}{1:  }6                |
-      {1:  }7                 {3:│}{1:  }7                |
-      {1:  }8                 {3:│}{1:  }8                |
-      {1:  }9                 {3:│}{1:  }9                |
-      {1:  }10                {3:│}{1:  }10               |
-      {1:  }{2:------------------}{3:│}{1:  }{4:11               }|
-      {6:~                   }{3:│}{6:~                  }|
-      {6:~                   }{3:│}{6:~                  }|
+      {1:  }^1                 │{1:  }1                |
+      {1:  }2                 │{1:  }2                |
+      {1:  }3                 │{1:  }3                |
+      {1:  }4                 │{1:  }4                |
+      {1:  }{4:4                 }│{1:  }{2:-----------------}|
+      {1:  }5                 │{1:  }5                |
+      {1:  }6                 │{1:  }6                |
+      {1:  }7                 │{1:  }7                |
+      {1:  }8                 │{1:  }8                |
+      {1:  }9                 │{1:  }9                |
+      {1:  }10                │{1:  }10               |
+      {1:  }{2:------------------}│{1:  }{4:11               }|
+      {6:~                   }│{6:~                  }|
+      {6:~                   }│{6:~                  }|
       {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
       :set diffopt+=internal                  |
     ]])
@@ -413,40 +413,40 @@ int main(int argc, char **argv)
       reread()
       feed(':set diffopt=internal,filler<cr>')
       screen:expect([[
-        {1:  }^#include <stdio.h>{3:│}{1:  }#include <stdio.h|
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }{8:// Frobs foo heart}{3:│}{1:  }{8:int fib(int n)}{9:   }|
-        {1:  }{4:int frobnitz(int f}{3:│}{1:  }{2:-----------------}|
-        {1:  }{                 {3:│}{1:  }{                |
-        {1:  }{9:    i}{8:nt i;}{9:        }{3:│}{1:  }{9:    i}{8:f(n > 2)}{9:    }|
-        {1:  }{4:    for(i = 0; i <}{3:│}{1:  }{2:-----------------}|
-        {1:  }    {             {3:│}{1:  }    {            |
-        {1:  }{9:        }{8:printf("Yo}{3:│}{1:  }{9:        }{8:return fi}|
-        {1:  }{4:        printf("%d}{3:│}{1:  }{2:-----------------}|
-        {1:  }    }             {3:│}{1:  }    }            |
-        {1:  }{2:------------------}{3:│}{1:  }{4:    return 1;    }|
-        {1:  }}                 {3:│}{1:  }}                |
-        {1:  }                  {3:│}{1:  }                 |
+        {1:  }^#include <stdio.h>│{1:  }#include <stdio.h|
+        {1:  }                  │{1:  }                 |
+        {1:  }{8:// Frobs foo heart}│{1:  }{8:int fib(int n)}{9:   }|
+        {1:  }{4:int frobnitz(int f}│{1:  }{2:-----------------}|
+        {1:  }{                 │{1:  }{                |
+        {1:  }{9:    i}{8:nt i;}{9:        }│{1:  }{9:    i}{8:f(n > 2)}{9:    }|
+        {1:  }{4:    for(i = 0; i <}│{1:  }{2:-----------------}|
+        {1:  }    {             │{1:  }    {            |
+        {1:  }{9:        }{8:printf("Yo}│{1:  }{9:        }{8:return fi}|
+        {1:  }{4:        printf("%d}│{1:  }{2:-----------------}|
+        {1:  }    }             │{1:  }    }            |
+        {1:  }{2:------------------}│{1:  }{4:    return 1;    }|
+        {1:  }}                 │{1:  }}                |
+        {1:  }                  │{1:  }                 |
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
         :set diffopt=internal,filler            |
       ]])
 
       feed('G')
       screen:expect([[
-        {1:  }{2:------------------}{3:│}{1:  }{4:int frobnitz(int }|
-        {1:  }{                 {3:│}{1:  }{                |
-        {1:  }{9:    i}{8:f(n > 1)}{9:     }{3:│}{1:  }{9:    i}{8:nt i;}{9:       }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    for(i = 0; i }|
-        {1:  }    {             {3:│}{1:  }    {            |
-        {1:  }{9:        }{8:return fac}{3:│}{1:  }{9:        }{8:printf("%}|
-        {1:  }    }             {3:│}{1:  }    }            |
-        {1:  }{4:    return 1;     }{3:│}{1:  }{2:-----------------}|
-        {1:  }}                 {3:│}{1:  }}                |
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }int main(int argc,{3:│}{1:  }int main(int argc|
-        {1:  }{                 {3:│}{1:  }{                |
-        {1:  }{9:    frobnitz(f}{8:act}{9:(}{3:│}{1:  }{9:    frobnitz(f}{8:ib}{9:(}|
-        {1:  }^}                 {3:│}{1:  }}                |
+        {1:  }{2:------------------}│{1:  }{4:int frobnitz(int }|
+        {1:  }{                 │{1:  }{                |
+        {1:  }{9:    i}{8:f(n > 1)}{9:     }│{1:  }{9:    i}{8:nt i;}{9:       }|
+        {1:  }{2:------------------}│{1:  }{4:    for(i = 0; i }|
+        {1:  }    {             │{1:  }    {            |
+        {1:  }{9:        }{8:return fac}│{1:  }{9:        }{8:printf("%}|
+        {1:  }    }             │{1:  }    }            |
+        {1:  }{4:    return 1;     }│{1:  }{2:-----------------}|
+        {1:  }}                 │{1:  }}                |
+        {1:  }                  │{1:  }                 |
+        {1:  }int main(int argc,│{1:  }int main(int argc|
+        {1:  }{                 │{1:  }{                |
+        {1:  }{9:    frobnitz(f}{8:act}{9:(}│{1:  }{9:    frobnitz(f}{8:ib}{9:(}|
+        {1:  }^}                 │{1:  }}                |
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
         :set diffopt=internal,filler            |
       ]])
@@ -456,40 +456,40 @@ int main(int argc, char **argv)
       reread()
       feed(':set diffopt=internal,filler,algorithm:patience<cr>')
       screen:expect([[
-        {1:  }^#include <stdio.h>{3:│}{1:  }#include <stdio.h|
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }{2:------------------}{3:│}{1:  }{4:int fib(int n)   }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:{                }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    if(n > 2)    }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    {            }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:        return fi}|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    }            }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    return 1;    }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:}                }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:                 }|
-        {1:  }// Frobs foo heart{3:│}{1:  }// Frobs foo hear|
-        {1:  }int frobnitz(int f{3:│}{1:  }int frobnitz(int |
-        {1:  }{                 {3:│}{1:  }{                |
+        {1:  }^#include <stdio.h>│{1:  }#include <stdio.h|
+        {1:  }                  │{1:  }                 |
+        {1:  }{2:------------------}│{1:  }{4:int fib(int n)   }|
+        {1:  }{2:------------------}│{1:  }{4:{                }|
+        {1:  }{2:------------------}│{1:  }{4:    if(n > 2)    }|
+        {1:  }{2:------------------}│{1:  }{4:    {            }|
+        {1:  }{2:------------------}│{1:  }{4:        return fi}|
+        {1:  }{2:------------------}│{1:  }{4:    }            }|
+        {1:  }{2:------------------}│{1:  }{4:    return 1;    }|
+        {1:  }{2:------------------}│{1:  }{4:}                }|
+        {1:  }{2:------------------}│{1:  }{4:                 }|
+        {1:  }// Frobs foo heart│{1:  }// Frobs foo hear|
+        {1:  }int frobnitz(int f│{1:  }int frobnitz(int |
+        {1:  }{                 │{1:  }{                |
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
                                                 |
       ]])
 
       feed('G')
       screen:expect([[
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }{4:int fact(int n)   }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:{                 }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    if(n > 1)     }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    {             }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:        return fac}{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    }             }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    return 1;     }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:}                 }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:                  }{3:│}{1:  }{2:-----------------}|
-        {1:  }int main(int argc,{3:│}{1:  }int main(int argc|
-        {1:  }{                 {3:│}{1:  }{                |
-        {1:  }{9:    frobnitz(f}{8:act}{9:(}{3:│}{1:  }{9:    frobnitz(f}{8:ib}{9:(}|
-        {1:  }^}                 {3:│}{1:  }}                |
+        {1:  }                  │{1:  }                 |
+        {1:  }{4:int fact(int n)   }│{1:  }{2:-----------------}|
+        {1:  }{4:{                 }│{1:  }{2:-----------------}|
+        {1:  }{4:    if(n > 1)     }│{1:  }{2:-----------------}|
+        {1:  }{4:    {             }│{1:  }{2:-----------------}|
+        {1:  }{4:        return fac}│{1:  }{2:-----------------}|
+        {1:  }{4:    }             }│{1:  }{2:-----------------}|
+        {1:  }{4:    return 1;     }│{1:  }{2:-----------------}|
+        {1:  }{4:}                 }│{1:  }{2:-----------------}|
+        {1:  }{4:                  }│{1:  }{2:-----------------}|
+        {1:  }int main(int argc,│{1:  }int main(int argc|
+        {1:  }{                 │{1:  }{                |
+        {1:  }{9:    frobnitz(f}{8:act}{9:(}│{1:  }{9:    frobnitz(f}{8:ib}{9:(}|
+        {1:  }^}                 │{1:  }}                |
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
                                                 |
       ]])
@@ -499,40 +499,40 @@ int main(int argc, char **argv)
       reread()
       feed(':set diffopt=internal,filler,algorithm:histogram<cr>')
       screen:expect([[
-        {1:  }^#include <stdio.h>{3:│}{1:  }#include <stdio.h|
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }{2:------------------}{3:│}{1:  }{4:int fib(int n)   }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:{                }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    if(n > 2)    }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    {            }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:        return fi}|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    }            }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:    return 1;    }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:}                }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:                 }|
-        {1:  }// Frobs foo heart{3:│}{1:  }// Frobs foo hear|
-        {1:  }int frobnitz(int f{3:│}{1:  }int frobnitz(int |
-        {1:  }{                 {3:│}{1:  }{                |
+        {1:  }^#include <stdio.h>│{1:  }#include <stdio.h|
+        {1:  }                  │{1:  }                 |
+        {1:  }{2:------------------}│{1:  }{4:int fib(int n)   }|
+        {1:  }{2:------------------}│{1:  }{4:{                }|
+        {1:  }{2:------------------}│{1:  }{4:    if(n > 2)    }|
+        {1:  }{2:------------------}│{1:  }{4:    {            }|
+        {1:  }{2:------------------}│{1:  }{4:        return fi}|
+        {1:  }{2:------------------}│{1:  }{4:    }            }|
+        {1:  }{2:------------------}│{1:  }{4:    return 1;    }|
+        {1:  }{2:------------------}│{1:  }{4:}                }|
+        {1:  }{2:------------------}│{1:  }{4:                 }|
+        {1:  }// Frobs foo heart│{1:  }// Frobs foo hear|
+        {1:  }int frobnitz(int f│{1:  }int frobnitz(int |
+        {1:  }{                 │{1:  }{                |
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
                                                 |
       ]])
 
       feed('G')
       screen:expect([[
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }{4:int fact(int n)   }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:{                 }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    if(n > 1)     }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    {             }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:        return fac}{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    }             }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:    return 1;     }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:}                 }{3:│}{1:  }{2:-----------------}|
-        {1:  }{4:                  }{3:│}{1:  }{2:-----------------}|
-        {1:  }int main(int argc,{3:│}{1:  }int main(int argc|
-        {1:  }{                 {3:│}{1:  }{                |
-        {1:  }{9:    frobnitz(f}{8:act}{9:(}{3:│}{1:  }{9:    frobnitz(f}{8:ib}{9:(}|
-        {1:  }^}                 {3:│}{1:  }}                |
+        {1:  }                  │{1:  }                 |
+        {1:  }{4:int fact(int n)   }│{1:  }{2:-----------------}|
+        {1:  }{4:{                 }│{1:  }{2:-----------------}|
+        {1:  }{4:    if(n > 1)     }│{1:  }{2:-----------------}|
+        {1:  }{4:    {             }│{1:  }{2:-----------------}|
+        {1:  }{4:        return fac}│{1:  }{2:-----------------}|
+        {1:  }{4:    }             }│{1:  }{2:-----------------}|
+        {1:  }{4:    return 1;     }│{1:  }{2:-----------------}|
+        {1:  }{4:}                 }│{1:  }{2:-----------------}|
+        {1:  }{4:                  }│{1:  }{2:-----------------}|
+        {1:  }int main(int argc,│{1:  }int main(int argc|
+        {1:  }{                 │{1:  }{                |
+        {1:  }{9:    frobnitz(f}{8:act}{9:(}│{1:  }{9:    frobnitz(f}{8:ib}{9:(}|
+        {1:  }^}                 │{1:  }}                |
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
                                                 |
       ]])
@@ -566,20 +566,20 @@ int main(int argc, char **argv)
       reread()
       feed(":set diffopt=internal,filler<cr>")
       screen:expect([[
-        {1:  }^def finalize(value{3:│}{1:  }def finalize(valu|
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }  values.each do |{3:│}{1:  }  values.each do |
-        {1:  }{2:------------------}{3:│}{1:  }{4:    v.prepare    }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:  end            }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:                 }|
-        {1:  }{2:------------------}{3:│}{1:  }{4:  values.each do }|
-        {1:  }    v.finalize    {3:│}{1:  }    v.finalize   |
-        {1:  }  end             {3:│}{1:  }  end            |
-        {6:~                   }{3:│}{6:~                  }|
-        {6:~                   }{3:│}{6:~                  }|
-        {6:~                   }{3:│}{6:~                  }|
-        {6:~                   }{3:│}{6:~                  }|
-        {6:~                   }{3:│}{6:~                  }|
+        {1:  }^def finalize(value│{1:  }def finalize(valu|
+        {1:  }                  │{1:  }                 |
+        {1:  }  values.each do |│{1:  }  values.each do |
+        {1:  }{2:------------------}│{1:  }{4:    v.prepare    }|
+        {1:  }{2:------------------}│{1:  }{4:  end            }|
+        {1:  }{2:------------------}│{1:  }{4:                 }|
+        {1:  }{2:------------------}│{1:  }{4:  values.each do }|
+        {1:  }    v.finalize    │{1:  }    v.finalize   |
+        {1:  }  end             │{1:  }  end            |
+        {6:~                   }│{6:~                  }|
+        {6:~                   }│{6:~                  }|
+        {6:~                   }│{6:~                  }|
+        {6:~                   }│{6:~                  }|
+        {6:~                   }│{6:~                  }|
         {7:<onal-diff-screen-1  }{3:<l-diff-screen-1.2 }|
         :set diffopt=internal,filler            |
       ]])
@@ -589,20 +589,20 @@ int main(int argc, char **argv)
       reread()
       feed(':set diffopt=internal,filler,indent-heuristic<cr>')
       screen:expect([[
-        {1:  }^def finalize(value{3:│}{1:  }def finalize(valu|
-        {1:  }                  {3:│}{1:  }                 |
-        {1:  }{2:------------------}{3:│}{1:  }{