From d9de4c0efb142e140bbddd87ffcb0bf222bb6fbc Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro+github@gmail.com>
Date: Wed, 3 Apr 2019 10:48:47 +0200
Subject: vim-patch:8.1.1072: extending sign and foldcolumn below the text is
 confusing (#9816)

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)

https://github.com/vim/vim/commit/8ee4c01b8c79a29065c1af05e5d9c0721069765f

Closes https://github.com/neovim/neovim/issues/9613
---
 test/functional/ui/diff_spec.lua         | 408 +++++++++++++++----------------
 test/functional/ui/fold_spec.lua         |  48 ++--
 test/functional/ui/highlight_spec.lua    |  18 +-
 test/functional/ui/sign_spec.lua         | 168 ++++++-------
 test/functional/viml/completion_spec.lua |  18 +-
 5 files changed, 330 insertions(+), 330 deletions(-)

(limited to 'test')

diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua
index 8e6756e550..8eb2bbf779 100644
--- a/test/functional/ui/diff_spec.lua
+++ b/test/functional/ui/diff_spec.lua
@@ -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 }|
         :                                       |
       ]])
diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua
index 943cbcef56..5fa299bed9 100644
--- a/test/functional/ui/fold_spec.lua
+++ b/test/functional/ui/fold_spec.lua
@@ -39,11 +39,11 @@ describe("folded lines", function()
     screen:expect([[
       {7:+ }{5:  1 +--  2 lines: ·························}|
       {7:+ }{5:  0 ^+--  2 lines: ·························}|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
       :set foldcolumn=2                            |
     ]])
   end)
@@ -93,12 +93,12 @@ describe("folded lines", function()
     feed_command("set number foldcolumn=2")
     screen:expect([[
       {7:+ }{5:  1 ^+--  2 lines: å 语 x̎͂̀̂͛͛ العَرَبِيَّة···········}|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
-      {7:  }{1:~                                          }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
       :set number foldcolumn=2                     |
     ]])
 
@@ -106,12 +106,12 @@ describe("folded lines", function()
     feed_command("set rightleft")
     screen:expect([[
       {5:+--  2 lines: å ······················^·  1 }{7: +}|
-      {1:                                          ~}{7:  }|
-      {1:                                          ~}{7:  }|
-      {1:                                          ~}{7:  }|
-      {1:                                          ~}{7:  }|
-      {1:                                          ~}{7:  }|
-      {1:                                          ~}{7:  }|
+      {1:                                            ~}|
+      {1:                                            ~}|
+      {1:                                            ~}|
+      {1:                                            ~}|
+      {1:                                            ~}|
+      {1:                                            ~}|
       :set rightleft                               |
     ]])
 
@@ -178,7 +178,7 @@ describe("folded lines", function()
       {1::}set foldmethod=manual                       |
       {1::}let x = 1                                   |
       {1::}^                                            |
-      {1::~                                           }|
+      {1:~                                            }|
       {3:[Command Line]                               }|
       :                                            |
     ]])
@@ -189,8 +189,8 @@ describe("folded lines", function()
       {2:[No Name]                                    }|
       {1::}{5:^+--  2 lines: set foldmethod=manual·········}|
       {1::}                                            |
-      {1::~                                           }|
-      {1::~                                           }|
+      {1:~                                            }|
+      {1:~                                            }|
       {3:[Command Line]                               }|
       :                                            |
     ]])
@@ -214,7 +214,7 @@ describe("folded lines", function()
       {1:/}alpha                                       |
       {1:/}{6:omega}                                       |
       {1:/}^                                            |
-      {1:/~                                           }|
+      {1:~                                            }|
       {3:[Command Line]                               }|
       /                                            |
     ]])
@@ -224,9 +224,9 @@ describe("folded lines", function()
                                                    |
       {2:[No Name]                                    }|
       {1:/}{5:^+--  3 lines: alpha·························}|
-      {1:/~                                           }|
-      {1:/~                                           }|
-      {1:/~                                           }|
+      {1:~                                            }|
+      {1:~                                            }|
+      {1:~                                            }|
       {3:[Command Line]                               }|
       /                                            |
     ]])
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index fbd0e5c53b..85b5aed2f8 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -841,9 +841,9 @@ describe('CursorLine highlight', function()
       {1:  }extra line!            {4:│}{1:  }extra line!           |
       {1:  }last line ...          {4:│}{1:  }last line ...         |
       {1:  }                       {4:│}{1:  }                      |
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
+      {8:~                        }{4:│}{8:~                       }|
+      {8:~                        }{4:│}{8:~                       }|
+      {8:~                        }{4:│}{8:~                       }|
       {4:[No Name] [+]             }{9:[No Name] [+]           }|
                                                         |
     ]])
@@ -856,9 +856,9 @@ describe('CursorLine highlight', function()
       {1:  }extra line!            {4:│}{1:  }extra line!           |
       {1:  }last line ...          {4:│}{1:  }last line ...         |
       {1:  }{7:                       }{4:│}{1:  }{7:^                      }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
+      {8:~                        }{4:│}{8:~                       }|
+      {8:~                        }{4:│}{8:~                       }|
+      {8:~                        }{4:│}{8:~                       }|
       {4:[No Name] [+]             }{9:[No Name] [+]           }|
                                                         |
     ]])
@@ -875,9 +875,9 @@ describe('CursorLine highlight', function()
       {1:  }extra line!            {4:│}{1:  }extra line!           |
       {1:  }last line ...          {4:│}{1:  }last line ...         |
       {1:  }                       {4:│}{1:  }                      |
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
-      {1:  }{8:~                      }{4:│}{1:  }{8:~                     }|
+      {8:~                        }{4:│}{8:~                       }|
+      {8:~                        }{4:│}{8:~                       }|
+      {8:~                        }{4:│}{8:~                       }|
       {4:[No Name] [+]             }{9:[No Name] [+]           }|
                                                         |
     ]], {
diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua
index c9821ef619..74019046c0 100644
--- a/test/functional/ui/sign_spec.lua
+++ b/test/functional/ui/sign_spec.lua
@@ -43,15 +43,15 @@ describe('Signs', function()
         {2:  }b                                                  |
         {1:>>}c                                                  |
         {2:  }^                                                   |
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
     end)
@@ -72,14 +72,14 @@ describe('Signs', function()
         {1:>>}b                                                  |
         {2:  }c                                                  |
         {2:  }                                                   |
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         {4:[No Name] [+]                                        }|
         {2:  }{3:a                                                  }|
         {1:>>}b                                                  |
         {2:  }c                                                  |
         {2:  }                                                   |
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
         {5:[No Name] [+]                                        }|
                                                              |
       ]])
@@ -102,15 +102,15 @@ describe('Signs', function()
         {2:  }{6:  2 }{8:b                                              }|
         {2:  }{7:  3 }c                                              |
         {1:>>}{7:  4 }{8:^                                               }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
     end)
@@ -138,15 +138,15 @@ describe('Signs', function()
         XX{1:>>}{6:  2 }b                                            |
         {1:>>}WW{6:  3 }c                                            |
         {2:    }{6:  4 }^                                             |
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
-        {2:    }{0:~                                                }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
       -- With the default setting, we get the sign with the top id.
@@ -156,15 +156,15 @@ describe('Signs', function()
         {1:>>}{6:  2 }b                                              |
         WW{6:  3 }c                                              |
         {2:  }{6:  4 }^                                               |
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
       -- "auto:3" accommodates all the signs we defined so far.
@@ -174,15 +174,15 @@ describe('Signs', function()
         XX{1:>>}{2:  }{6:  2 }b                                          |
         XX{1:>>}WW{6:  3 }c                                          |
         {2:      }{6:  4 }^                                           |
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
       -- Check "yes:9".
@@ -192,15 +192,15 @@ describe('Signs', function()
         XX{1:>>}{2:              }{6:  2 }b                              |
         XX{1:>>}WW{2:            }{6:  3 }c                              |
         {2:                  }{6:  4 }^                               |
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
-        {2:                  }{0:~                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
       -- Check "auto:N" larger than the maximum number of signs defined in
@@ -211,15 +211,15 @@ describe('Signs', function()
         XX{1:>>}{2:  }{6:  2 }b                                          |
         XX{1:>>}WW{6:  3 }c                                          |
         {2:      }{6:  4 }^                                           |
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
-        {2:      }{0:~                                              }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]]}
     end)
@@ -230,12 +230,12 @@ describe('Signs', function()
       feed(':sign place<cr>')
       screen:expect([[
         {1:>>}                                                   |
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         {4:                                                     }|
         :sign place                                          |
         {9:--- Signs ---}                                        |
@@ -248,18 +248,18 @@ describe('Signs', function()
       feed('<cr>')
       screen:expect([[
         {1:>>}^                                                   |
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
-        {2:  }{0:~                                                  }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
     end)
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua
index a8d6135e3f..9d4cb325d9 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/viml/completion_spec.lua
@@ -904,9 +904,9 @@ describe('completion', function()
                                                                     |
         {8:[No Name]                                                   }|
         {0::}foo faa fee f^                                              |
-        {0::~                                                          }|
-        {0::~                                                          }|
-        {0::~                                                          }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {9:[Command Line]                                              }|
         {3:-- INSERT --}                                                |
       ]] )
@@ -915,9 +915,9 @@ describe('completion', function()
                                                                     |
         {8:[No Name]                                                   }|
         {0::}foo faa fee foo^                                            |
-        {0::~          }{2: foo            }{0:                                }|
-        {0::~          }{1: faa            }{0:                                }|
-        {0::~          }{1: fee            }{0:                                }|
+        {0:~           }{2: foo            }{0:                                }|
+        {0:~           }{1: faa            }{0:                                }|
+        {0:~           }{1: fee            }{0:                                }|
         {9:[Command Line]                                              }|
         {3:-- Keyword Local completion (^N^P) }{4:match 1 of 3}             |
       ]])
@@ -926,9 +926,9 @@ describe('completion', function()
                                                                     |
         {8:[No Name]                                                   }|
         {0::}foo faa fee foo                                            |
-        {0::~                                                          }|
-        {0::~                                                          }|
-        {0::~                                                          }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {9:[Command Line]                                              }|
         :foo faa fee foo^                                            |
       ]])
-- 
cgit