Add new highlight groups TermCursor/TermCursorNC

These highlight groups replace the old mechanism of setting:

  - {g,b}:terminal_focused_cursor_highlight
  - {g,b}:terminal_unfocused_cursor_highlight

2 files changed, 4 insertions, 4 deletions

diff --git a/test/functional/terminal/cursor_spec.lua b/test/functional/terminal/cursor_spec.lua
index 3e3f9cbf4f..cecb33de7c 100644
--- a/test/functional/terminal/cursor_spec.lua
+++ b/test/functional/terminal/cursor_spec.lua
@@ -129,10 +129,8 @@ describe('cursor with customized highlighting', function()
 
   before_each(function()
     clear()
-    nvim('set_var', 'terminal_focused_cursor_highlight', 'CursorFocused')
-    nvim('set_var', 'terminal_unfocused_cursor_highlight', 'CursorUnfocused')
-    nvim('command', 'highlight CursorFocused ctermfg=45 ctermbg=46')
-    nvim('command', 'highlight CursorUnfocused ctermfg=55 ctermbg=56')
+    nvim('command', 'highlight TermCursor ctermfg=45 ctermbg=46 cterm=NONE')
+    nvim('command', 'highlight TermCursorNC ctermfg=55 ctermbg=56 cterm=NONE')
     screen = Screen.new(50, 7)
     screen:set_default_attr_ids({
       [1] = {foreground = 45, background = 46},
diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index 631dc579d3..1bc6057a0b 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -34,6 +34,8 @@ local function disable_mouse() feed_termcode('[?1002l') end
 
 
 local function screen_setup(extra_height)
+  nvim('command', 'highlight TermCursor cterm=reverse')
+  nvim('command', 'highlight TermCursorNC ctermbg=11')
   nvim('set_var', 'terminal_scrollback_buffer_size', 10)
   if not extra_height then extra_height = 0 end
   local screen = Screen.new(50, 7 + extra_height)