Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 12 insertions, 16 deletions

diff --git a/test/functional/legacy/digraph_spec.lua b/test/functional/legacy/digraph_spec.lua
index 015f144b74..ed1071079c 100644
--- a/test/functional/legacy/digraph_spec.lua
+++ b/test/functional/legacy/digraph_spec.lua
@@ -1,7 +1,8 @@
-local helpers = require('test.functional.helpers')(after_each)
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local clear = helpers.clear
-local feed = helpers.feed
+
+local clear = n.clear
+local feed = n.feed
 
 before_each(clear)
 
@@ -9,29 +10,24 @@ describe('digraph', function()
   -- oldtest: Test_entering_digraph()
   it('characters displayed on the screen', function()
     local screen = Screen.new(10, 6)
-    screen:set_default_attr_ids({
-      [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { foreground = Screen.colors.Blue }, -- SpecialKey
-      [2] = { bold = true }, -- ModeMsg
-    })
     screen:attach()
     feed('i<C-K>')
     screen:expect([[
-      {1:^?}           |
-      {0:~           }|*4
-      {2:-- INSERT --}|
+      {18:^?}           |
+      {1:~           }|*4
+      {5:-- INSERT --}|
     ]])
     feed('1')
     screen:expect([[
-      {1:^1}           |
-      {0:~           }|*4
-      {2:-- INSERT --}|
+      {18:^1}           |
+      {1:~           }|*4
+      {5:-- INSERT --}|
     ]])
     feed('2')
     screen:expect([[
       ½^           |
-      {0:~           }|*4
-      {2:-- INSERT --}|
+      {1:~           }|*4
+      {5:-- INSERT --}|
     ]])
   end)
 end)