Merge branch 'master' into option-fixes

14 files changed, 850 insertions, 554 deletions

diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
index 53fe303762..e1e11203e0 100644
--- a/test/functional/ui/bufhl_spec.lua
+++ b/test/functional/ui/bufhl_spec.lua
@@ -1,7 +1,8 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
+
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local execute, request, neq = helpers.execute, helpers.request, helpers.neq
+local command, request, neq = helpers.command, helpers.request, helpers.neq
 
 if helpers.pending_win32(pending) then return end
 
@@ -11,7 +12,7 @@ describe('Buffer highlighting', function()
 
   before_each(function()
     clear()
-    execute("syntax on")
+    command('syntax on')
     screen = Screen.new(40, 8)
     screen:attach()
     screen:set_default_attr_ids({
@@ -106,7 +107,7 @@ describe('Buffer highlighting', function()
         combining highlights
         from different sources]])
 
-      execute("hi ImportantWord gui=bold cterm=bold")
+      command("hi ImportantWord gui=bold cterm=bold")
       id1 = add_hl(0, "ImportantWord", 0, 2, 8)
       add_hl(id1, "ImportantWord", 1, 12, -1)
       add_hl(id1, "ImportantWord", 2, 0, 9)
@@ -131,7 +132,7 @@ describe('Buffer highlighting', function()
         {1:~                                       }|
         {1:~                                       }|
         {1:~                                       }|
-        :hi ImportantWord gui=bold cterm=bold   |
+                                                |
       ]])
     end)
 
@@ -145,7 +146,7 @@ describe('Buffer highlighting', function()
         {1:~                                       }|
         {1:~                                       }|
         {1:~                                       }|
-        :hi ImportantWord gui=bold cterm=bold   |
+                                                |
       ]])
     end)
 
@@ -159,7 +160,7 @@ describe('Buffer highlighting', function()
         {1:~                                       }|
         {1:~                                       }|
         {1:~                                       }|
-        :hi ImportantWord gui=bold cterm=bold   |
+                                                |
       ]])
     end)
 
@@ -175,7 +176,7 @@ describe('Buffer highlighting', function()
         {1:~                                       }|
         {1:~                                       }|
         {1:~                                       }|
-        :hi ImportantWord gui=bold cterm=bold   |
+                                                |
       ]])
     end)
 
@@ -192,7 +193,7 @@ describe('Buffer highlighting', function()
                                                 |
       ]])
 
-      execute(':3move 4')
+      command(':3move 4')
       screen:expect([[
         a {5:longer} example                        |
                                                 |
@@ -201,7 +202,7 @@ describe('Buffer highlighting', function()
         {1:~                                       }|
         {1:~                                       }|
         {1:~                                       }|
-        ::3move 4                               |
+                                                |
       ]])
     end)
   end)
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
new file mode 100644
index 0000000000..abe0e0b1fd
--- /dev/null
+++ b/test/functional/ui/cursor_spec.lua
@@ -0,0 +1,213 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, meths = helpers.clear, helpers.meths
+local eq = helpers.eq
+local command = helpers.command
+
+describe('ui/cursor', function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(25, 5)
+    screen:attach()
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  it("'guicursor' is published as a UI event", function()
+    local expected_mode_info = {
+      [1] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 0,
+        cursor_shape = 'block',
+        name = 'normal',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'n' },
+      [2] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 0,
+        cursor_shape = 'block',
+        name = 'visual',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'v' },
+      [3] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 25,
+        cursor_shape = 'vertical',
+        name = 'insert',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'i' },
+      [4] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 20,
+        cursor_shape = 'horizontal',
+        name = 'replace',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'r' },
+      [5] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 0,
+        cursor_shape = 'block',
+        name = 'cmdline_normal',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'c' },
+      [6] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 25,
+        cursor_shape = 'vertical',
+        name = 'cmdline_insert',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'ci' },
+      [7] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 20,
+        cursor_shape = 'horizontal',
+        name = 'cmdline_replace',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'cr' },
+      [8] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 50,
+        cursor_shape = 'horizontal',
+        name = 'operator',
+        hl_id = 46,
+        id_lm = 46,
+        mouse_shape = 0,
+        short_name = 'o' },
+      [9] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 35,
+        cursor_shape = 'vertical',
+        name = 'visual_select',
+        hl_id = 46,
+        id_lm = 46,
+        mouse_shape = 0,
+        short_name = 've' },
+      [10] = {
+        name = 'cmdline_hover',
+        mouse_shape = 0,
+        short_name = 'e' },
+      [11] = {
+        name = 'statusline_hover',
+        mouse_shape = 0,
+        short_name = 's' },
+      [12] = {
+        name = 'statusline_drag',
+        mouse_shape = 0,
+        short_name = 'sd' },
+      [13] = {
+        name = 'vsep_hover',
+        mouse_shape = 0,
+        short_name = 'vs' },
+      [14] = {
+        name = 'vsep_drag',
+        mouse_shape = 0,
+        short_name = 'vd' },
+      [15] = {
+        name = 'more',
+        mouse_shape = 0,
+        short_name = 'm' },
+      [16] = {
+        name = 'more_lastline',
+        mouse_shape = 0,
+        short_name = 'ml' },
+      [17] = {
+        blinkoff = 150,
+        blinkon = 175,
+        blinkwait = 175,
+        cell_percentage = 0,
+        cursor_shape = 'block',
+        name = 'showmatch',
+        hl_id = 46,
+        id_lm = 46,
+        short_name = 'sm' },
+      }
+
+    screen:expect(function()
+      -- Default 'guicursor' published on startup.
+      eq(expected_mode_info, screen._mode_info)
+      eq(true, screen._cursor_style_enabled)
+      eq('normal', screen.mode)
+    end)
+
+    -- Event is published ONLY if the cursor style changed.
+    screen._mode_info = nil
+    command("echo 'test'")
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+      test                     |
+    ]], nil, nil, function()
+      eq(nil, screen._mode_info)
+    end)
+
+    -- Change the cursor style.
+    meths.set_option('guicursor', 'n-v-c:ver35-blinkwait171-blinkoff172-blinkon173,ve:hor35,o:ver50,i-ci:block,r-cr:hor90,sm:ver42')
+    screen:expect(function()
+      local named = {}
+      for _, m in ipairs(screen._mode_info) do
+        named[m.name] = m
+      end
+      eq('vertical', named.normal.cursor_shape)
+      eq('horizontal', named.visual_select.cursor_shape)
+      eq('vertical', named.operator.cursor_shape)
+      eq('block', named.insert.cursor_shape)
+      eq('vertical', named.showmatch.cursor_shape)
+      eq(171, named.normal.blinkwait)
+      eq(172, named.normal.blinkoff)
+      eq(173, named.normal.blinkon)
+    end)
+  end)
+
+  it("empty 'guicursor' sets cursor_shape=block in all modes", function()
+    meths.set_option('guicursor', '')
+    screen:expect(function()
+      -- Empty 'guicursor' sets enabled=false.
+      eq(false, screen._cursor_style_enabled)
+      for _, m in ipairs(screen._mode_info) do
+        if m['cursor_shape'] ~= nil then
+          eq('block', m.cursor_shape)
+          eq(0, m.blinkon)
+        end
+      end
+    end)
+  end)
+
+end)
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 7a1b8c91e7..2bda907c33 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -2,23 +2,23 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local os = require('os')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local execute, request, eq = helpers.execute, helpers.request, helpers.eq
+local command = helpers.command
+local eval = helpers.eval
+local feed_command, request, eq = helpers.feed_command, helpers.request, helpers.eq
 
-if helpers.pending_win32(pending) then return end
-
-describe('color scheme compatibility', function()
+describe('colorscheme compatibility', function()
   before_each(function()
     clear()
   end)
 
   it('t_Co is set to 256 by default', function()
-    eq('256', request('vim_eval', '&t_Co'))
+    eq('256', eval('&t_Co'))
     request('nvim_set_option', 't_Co', '88')
-    eq('88', request('vim_eval', '&t_Co'))
+    eq('88', eval('&t_Co'))
   end)
 end)
 
-describe('manual syntax highlight', function()
+describe('highlight: `:syntax manual`', function()
   -- When using manual syntax highlighting, it should be preserved even when
   -- switching buffers... bug did only occur without :set hidden
   -- Ref: vim patch 7.4.1236
@@ -41,18 +41,18 @@ describe('manual syntax highlight', function()
   end)
 
   it("works with buffer switch and 'hidden'", function()
-    execute('e tmp1.vim')
-    execute('e Xtest-functional-ui-highlight.tmp.vim')
-    execute('filetype on')
-    execute('syntax manual')
-    execute('set ft=vim')
-    execute('set syntax=ON')
+    feed_command('e tmp1.vim')
+    feed_command('e Xtest-functional-ui-highlight.tmp.vim')
+    feed_command('filetype on')
+    feed_command('syntax manual')
+    feed_command('set ft=vim')
+    feed_command('set syntax=ON')
     feed('iecho 1<esc>0')
 
-    execute('set hidden')
-    execute('w')
-    execute('bn')
-    execute('bp')
+    feed_command('set hidden')
+    feed_command('w')
+    feed_command('bn')
+    feed_command('bp')
     screen:expect([[
       {1:^echo} 1              |
       {0:~                   }|
@@ -63,32 +63,32 @@ describe('manual syntax highlight', function()
   end)
 
   it("works with buffer switch and 'nohidden'", function()
-    execute('e tmp1.vim')
-    execute('e Xtest-functional-ui-highlight.tmp.vim')
-    execute('filetype on')
-    execute('syntax manual')
-    execute('set ft=vim')
-    execute('set syntax=ON')
+    command('e tmp1.vim')
+    command('e Xtest-functional-ui-highlight.tmp.vim')
+    command('filetype on')
+    command('syntax manual')
+    command('set filetype=vim fileformat=unix')
+    command('set syntax=ON')
     feed('iecho 1<esc>0')
 
-    execute('set nohidden')
-    execute('w')
-    execute('bn')
-    execute('bp')
+    command('set nohidden')
+    command('w')
+    command('silent bn')
+    eq("tmp1.vim", eval("fnamemodify(bufname('%'), ':t')"))
+    feed_command('silent bp')
+    eq("Xtest-functional-ui-highlight.tmp.vim", eval("fnamemodify(bufname('%'), ':t')"))
     screen:expect([[
       {1:^echo} 1              |
       {0:~                   }|
       {0:~                   }|
       {0:~                   }|
-      <ht.tmp.vim" 1L, 7C |
+      :silent bp          |
     ]])
   end)
 end)
 
 
-describe('Default highlight groups', function()
-  -- Test the default attributes for highlight groups shown by the :highlight
-  -- command
+describe('highlight defaults', function()
   local screen
 
   before_each(function()
@@ -107,7 +107,7 @@ describe('Default highlight groups', function()
       [1] = {reverse = true, bold = true},  -- StatusLine
       [2] = {reverse = true}                -- StatusLineNC
     })
-    execute('sp', 'vsp', 'vsp')
+    feed_command('sp', 'vsp', 'vsp')
     screen:expect([[
       ^                    {2:|}                {2:|}               |
       {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
@@ -200,58 +200,31 @@ describe('Default highlight groups', function()
 
   it('insert mode text', function()
     feed('i')
+    screen:try_resize(53, 4)
     screen:expect([[
       ^                                                     |
       {0:~                                                    }|
       {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
       {1:-- INSERT --}                                         |
     ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
     [1] = {bold = true}})
   end)
 
   it('end of file markers', function()
+    screen:try_resize(53, 4)
     screen:expect([[
       ^                                                     |
       {1:~                                                    }|
       {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
-      {1:~                                                    }|
                                                            |
     ]], {[1] = {bold = true, foreground = Screen.colors.Blue}})
   end)
 
   it('"wait return" text', function()
+    screen:try_resize(53, 4)
     feed(':ls<cr>')
     screen:expect([[
       {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
       :ls                                                  |
         1 %a   "[No Name]"                    line 1       |
       {1:Press ENTER or type command to continue}^              |
@@ -259,89 +232,84 @@ describe('Default highlight groups', function()
     [1] = {bold = true, foreground = Screen.colors.SeaGreen}})
     feed('<cr>') --  skip the "Press ENTER..." state or tests will hang
   end)
+
   it('can be cleared and linked to other highlight groups', function()
-    execute('highlight clear ModeMsg')
+    screen:try_resize(53, 4)
+    feed_command('highlight clear ModeMsg')
     feed('i')
     screen:expect([[
       ^                                                     |
       {0:~                                                    }|
       {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
       -- INSERT --                                         |
     ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
     [1] = {bold=true}})
     feed('<esc>')
-    execute('highlight CustomHLGroup guifg=red guibg=green')
-    execute('highlight link ModeMsg CustomHLGroup')
+    feed_command('highlight CustomHLGroup guifg=red guibg=green')
+    feed_command('highlight link ModeMsg CustomHLGroup')
     feed('i')
     screen:expect([[
       ^                                                     |
       {0:~                                                    }|
       {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
       {1:-- INSERT --}                                         |
     ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
     [1] = {foreground = Screen.colors.Red, background = Screen.colors.Green}})
   end)
+
   it('can be cleared by assigning NONE', function()
-    execute('syn keyword TmpKeyword neovim')
-    execute('hi link TmpKeyword ErrorMsg')
+    screen:try_resize(53, 4)
+    feed_command('syn keyword TmpKeyword neovim')
+    feed_command('hi link TmpKeyword ErrorMsg')
     insert('neovim')
     screen:expect([[
       {1:neovi^m}                                               |
       {0:~                                                    }|
       {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
                                                            |
     ]], {
       [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {foreground = Screen.colors.White, background = Screen.colors.Red}
     })
-    execute("hi ErrorMsg term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE"
+    feed_command("hi ErrorMsg term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE"
             .. " gui=NONE guifg=NONE guibg=NONE guisp=NONE")
     screen:expect([[
       neovi^m                                               |
       {0:~                                                    }|
       {0:~                                                    }|
+                                                           |
+    ]], {[0] = {bold=true, foreground=Screen.colors.Blue}})
+  end)
+
+  it('Cursor after `:hi clear|syntax reset` #6508', function()
+    command('highlight clear|syntax reset')
+    eq('guifg=bg guibg=fg', eval([[matchstr(execute('hi Cursor'), '\v(gui|cterm).*$')]]))
+  end)
+
+  it('Whitespace highlight', function()
+    screen:try_resize(53, 4)
+    feed_command('highlight NonText gui=NONE guifg=#FF0000')
+    feed_command('set listchars=space:.,tab:>-,trail:*,eol:¬ list')
+    insert('   ne \t o\tv  im  ')
+    screen:expect([[
+      ne{0:.>----.}o{0:>-----}v{0:..}im{0:*^*¬}                             |
       {0:~                                                    }|
       {0:~                                                    }|
+                                                           |
+    ]], {
+      [0] = {foreground=Screen.colors.Red},
+      [1] = {foreground=Screen.colors.Blue},
+    })
+    feed_command('highlight Whitespace gui=NONE guifg=#0000FF')
+    screen:expect([[
+      ne{1:.>----.}o{1:>-----}v{1:..}im{1:*^*}{0:¬}                             |
       {0:~                                                    }|
       {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-      {0:~                                                    }|
-                                                           |
-    ]], {[0] = {bold=true, foreground=Screen.colors.Blue}})
+      :highlight Whitespace gui=NONE guifg=#0000FF         |
+    ]], {
+      [0] = {foreground=Screen.colors.Red},
+      [1] = {foreground=Screen.colors.Blue},
+    })
   end)
 end)
 
@@ -355,19 +323,19 @@ describe('guisp (special/undercurl)', function()
   end)
 
   it('can be set and is applied like foreground or background', function()
-    execute('syntax on')
-    execute('syn keyword TmpKeyword neovim')
-    execute('syn keyword TmpKeyword1 special')
-    execute('syn keyword TmpKeyword2 specialwithbg')
-    execute('syn keyword TmpKeyword3 specialwithfg')
-    execute('hi! Awesome guifg=red guibg=yellow guisp=red')
-    execute('hi! Awesome1 guisp=red')
-    execute('hi! Awesome2 guibg=yellow guisp=red')
-    execute('hi! Awesome3 guifg=red guisp=red')
-    execute('hi link TmpKeyword Awesome')
-    execute('hi link TmpKeyword1 Awesome1')
-    execute('hi link TmpKeyword2 Awesome2')
-    execute('hi link TmpKeyword3 Awesome3')
+    feed_command('syntax on')
+    feed_command('syn keyword TmpKeyword neovim')
+    feed_command('syn keyword TmpKeyword1 special')
+    feed_command('syn keyword TmpKeyword2 specialwithbg')
+    feed_command('syn keyword TmpKeyword3 specialwithfg')
+    feed_command('hi! Awesome guifg=red guibg=yellow guisp=red')
+    feed_command('hi! Awesome1 guisp=red')
+    feed_command('hi! Awesome2 guibg=yellow guisp=red')
+    feed_command('hi! Awesome3 guifg=red guisp=red')
+    feed_command('hi link TmpKeyword Awesome')
+    feed_command('hi link TmpKeyword1 Awesome1')
+    feed_command('hi link TmpKeyword2 Awesome2')
+    feed_command('hi link TmpKeyword3 Awesome3')
     insert([[
       neovim
       awesome neovim
@@ -419,8 +387,8 @@ describe("'listchars' highlight", function()
       [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {background=Screen.colors.Grey90}
     })
-    execute('highlight clear ModeMsg')
-    execute('set cursorline')
+    feed_command('highlight clear ModeMsg')
+    feed_command('set cursorline')
     feed('i')
     screen:expect([[
       {1:^                    }|
@@ -445,7 +413,7 @@ describe("'listchars' highlight", function()
       {0:~                   }|
                           |
     ]])
-    execute('set nocursorline')
+    feed_command('set nocursorline')
     screen:expect([[
       abcdefg             |
       kkasd^f              |
@@ -469,8 +437,8 @@ describe("'listchars' highlight", function()
       ^f                   |
                           |
     ]])
-    execute('set cursorline')
-    execute('set cursorcolumn')
+    feed_command('set cursorline')
+    feed_command('set cursorcolumn')
     feed('kkiabcdefghijk<esc>hh')
     screen:expect([[
       kkasd   {1: }           |
@@ -509,11 +477,11 @@ describe("'listchars' highlight", function()
         foreground=Screen.colors.Red,
       },
     })
-    execute('highlight clear ModeMsg')
-    execute('highlight SpecialKey guifg=#FF0000')
-    execute('set cursorline')
-    execute('set tabstop=8')
-    execute('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
+    feed_command('highlight clear ModeMsg')
+    feed_command('highlight Whitespace guifg=#FF0000')
+    feed_command('set cursorline')
+    feed_command('set tabstop=8')
+    feed_command('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
     feed('i\t abcd <cr>\t abcd <cr><esc>k')
     screen:expect([[
       {5:>-------.}abcd{5:*}{4:¬}     |
@@ -530,7 +498,7 @@ describe("'listchars' highlight", function()
       {4:~                   }|
                           |
     ]])
-    execute('set nocursorline')
+    feed_command('set nocursorline')
     screen:expect([[
       {5:^>-------.}abcd{5:*}{4:¬}     |
       {5:>-------.}abcd{5:*}{4:¬}     |
@@ -538,7 +506,7 @@ describe("'listchars' highlight", function()
       {4:~                   }|
       :set nocursorline   |
     ]])
-    execute('set nowrap')
+    feed_command('set nowrap')
     feed('ALorem ipsum dolor sit amet<ESC>0')
     screen:expect([[
       {5:^>-------.}abcd{5:.}Lorem{4:>}|
@@ -547,7 +515,7 @@ describe("'listchars' highlight", function()
       {4:~                   }|
                           |
     ]])
-    execute('set cursorline')
+    feed_command('set cursorline')
     screen:expect([[
       {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{4:>}|
       {5:>-------.}abcd{5:*}{4:¬}     |
@@ -605,12 +573,12 @@ describe("'listchars' highlight", function()
         bold=true,
       },
     })
-    execute('highlight clear ModeMsg')
-    execute('highlight SpecialKey guifg=#FF0000')
-    execute('set cursorline')
-    execute('set tabstop=8')
-    execute('set nowrap')
-    execute('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
+    feed_command('highlight clear ModeMsg')
+    feed_command('highlight Whitespace guifg=#FF0000')
+    feed_command('set cursorline')
+    feed_command('set tabstop=8')
+    feed_command('set nowrap')
+    feed_command('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
     feed('i\t abcd <cr>\t abcd Lorem ipsum dolor sit amet<cr><esc>kkk0')
     screen:expect([[
       {2:^>-------.}{1:abcd}{2:*}{3:¬}{1:     }|
@@ -652,10 +620,10 @@ describe("'listchars' highlight", function()
       [2] = {foreground=Screen.colors.Red},
       [3] = {foreground=Screen.colors.Green1},
     })
-    execute('highlight clear ModeMsg')
-    execute('highlight SpecialKey guifg=#FF0000')
-    execute('highlight Error guifg=#00FF00')
-    execute('set nowrap')
+    feed_command('highlight clear ModeMsg')
+    feed_command('highlight Whitespace guifg=#FF0000')
+    feed_command('highlight Error guifg=#00FF00')
+    feed_command('set nowrap')
     feed('ia \t bc \t  <esc>')
     screen:expect([[
       a        bc      ^   |
@@ -664,7 +632,7 @@ describe("'listchars' highlight", function()
       {0:~                   }|
                           |
     ]])
-    execute('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
+    feed_command('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
     screen:expect([[
       a{2:.>-----.}bc{2:*>---*^*}{0:¬} |
       {0:~                   }|
@@ -672,7 +640,7 @@ describe("'listchars' highlight", function()
       {0:~                   }|
                           |
     ]])
-    execute('match Error /\\s\\+$/')
+    feed_command('match Error /\\s\\+$/')
     screen:expect([[
       a{2:.>-----.}bc{3:*>---*^*}{0:¬} |
       {0:~                   }|
diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index 3b31da0397..a7be1a9dc8 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -1,10 +1,11 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
+local command = helpers.command
 local curbufmeths = helpers.curbufmeths
 local eq = helpers.eq
 local eval = helpers.eval
-local execute = helpers.execute
+local feed_command = helpers.feed_command
 local expect = helpers.expect
 local feed = helpers.feed
 local insert = helpers.insert
@@ -21,9 +22,9 @@ local default_text = [[
 
 local function common_setup(screen, inccommand, text)
   if screen then
-    execute("syntax on")
-    execute("set nohlsearch")
-    execute("hi Substitute guifg=red guibg=yellow")
+    command("syntax on")
+    command("set nohlsearch")
+    command("hi Substitute guifg=red guibg=yellow")
     screen:attach()
     screen:set_default_attr_ids({
       [1]  = {foreground = Screen.colors.Fuchsia},
@@ -46,7 +47,7 @@ local function common_setup(screen, inccommand, text)
     })
   end
 
-  execute("set inccommand=" .. (inccommand and inccommand or ""))
+  command("set inccommand=" .. (inccommand and inccommand or ""))
 
   if text then
     insert(text)
@@ -91,8 +92,8 @@ describe(":substitute, 'inccommand' preserves", function()
     local screen = Screen.new(30,10)
     common_setup(screen, "split", "ABC")
 
-    execute("%s/AB/BA/")
-    execute("ls")
+    feed_command("%s/AB/BA/")
+    feed_command("ls")
 
     screen:expect([[
       {15:~                             }|
@@ -111,25 +112,25 @@ describe(":substitute, 'inccommand' preserves", function()
   for _, case in pairs{"", "split", "nosplit"} do
     it("various delimiters (inccommand="..case..")", function()
       insert(default_text)
-      execute("set inccommand=" .. case)
+      feed_command("set inccommand=" .. case)
 
       local delims = { '/', '#', ';', '%', ',', '@', '!', ''}
       for _,delim in pairs(delims) do
-        execute("%s"..delim.."lines"..delim.."LINES"..delim.."g")
+        feed_command("%s"..delim.."lines"..delim.."LINES"..delim.."g")
         expect([[
           Inc substitution on
           two LINES
           ]])
-        execute("undo")
+        feed_command("undo")
       end
     end)
   end
 
   for _, case in pairs{"", "split", "nosplit"} do
     it("'undolevels' (inccommand="..case..")", function()
-      execute("set undolevels=139")
-      execute("setlocal undolevels=34")
-      execute("set inccommand=" .. case)
+      feed_command("set undolevels=139")
+      feed_command("setlocal undolevels=34")
+      feed_command("set inccommand=" .. case)
       insert("as")
       feed(":%s/as/glork/<enter>")
       eq(meths.get_option('undolevels'), 139)
@@ -139,8 +140,8 @@ describe(":substitute, 'inccommand' preserves", function()
 
   for _, case in ipairs({"", "split", "nosplit"}) do
     it("empty undotree() (inccommand="..case..")", function()
-      execute("set undolevels=1000")
-      execute("set inccommand=" .. case)
+      feed_command("set undolevels=1000")
+      feed_command("set inccommand=" .. case)
       local expected_undotree = eval("undotree()")
 
       -- Start typing an incomplete :substitute command.
@@ -157,8 +158,8 @@ describe(":substitute, 'inccommand' preserves", function()
 
   for _, case in ipairs({"", "split", "nosplit"}) do
     it("undotree() with branches (inccommand="..case..")", function()
-      execute("set undolevels=1000")
-      execute("set inccommand=" .. case)
+      feed_command("set undolevels=1000")
+      feed_command("set inccommand=" .. case)
       -- Make some changes.
       feed([[isome text 1<C-\><C-N>]])
       feed([[osome text 2<C-\><C-N>]])
@@ -192,7 +193,7 @@ describe(":substitute, 'inccommand' preserves", function()
 
   for _, case in pairs{"", "split", "nosplit"} do
     it("b:changedtick (inccommand="..case..")", function()
-      execute("set inccommand=" .. case)
+      feed_command("set inccommand=" .. case)
       feed([[isome text 1<C-\><C-N>]])
       feed([[osome text 2<C-\><C-N>]])
       local expected_tick = eval("b:changedtick")
@@ -271,18 +272,18 @@ describe(":substitute, 'inccommand' preserves undo", function()
 
   local function test_sub(substring, split, redoable)
     clear()
-    execute("set inccommand=" .. split)
+    feed_command("set inccommand=" .. split)
 
     insert("1")
     feed("o2<esc>")
-    execute("undo")
+    feed_command("undo")
     feed("o3<esc>")
     if redoable then
       feed("o4<esc>")
-      execute("undo")
+      feed_command("undo")
     end
     feed(substring.. "<enter>")
-    execute("undo")
+    feed_command("undo")
 
     feed("g-")
     expect([[
@@ -297,15 +298,15 @@ describe(":substitute, 'inccommand' preserves undo", function()
 
   local function test_notsub(substring, split, redoable)
     clear()
-    execute("set inccommand=" .. split)
+    feed_command("set inccommand=" .. split)
 
     insert("1")
     feed("o2<esc>")
-    execute("undo")
+    feed_command("undo")
     feed("o3<esc>")
     if redoable then
       feed("o4<esc>")
-      execute("undo")
+      feed_command("undo")
     end
     feed(substring .. "<esc>")
 
@@ -331,7 +332,7 @@ describe(":substitute, 'inccommand' preserves undo", function()
 
   local function test_threetree(substring, split)
     clear()
-    execute("set inccommand=" .. split)
+    feed_command("set inccommand=" .. split)
 
     insert("1")
     feed("o2<esc>")
@@ -424,22 +425,22 @@ describe(":substitute, 'inccommand' preserves undo", function()
     for _, case in pairs(cases) do
       clear()
       common_setup(nil, case, default_text)
-      execute("set undolevels=0")
+      feed_command("set undolevels=0")
 
       feed("1G0")
       insert("X")
       feed(":%s/tw/MO/<esc>")
-      execute("undo")
+      feed_command("undo")
       expect(default_text)
-      execute("undo")
+      feed_command("undo")
       expect(default_text:gsub("Inc", "XInc"))
-      execute("undo")
+      feed_command("undo")
 
-      execute("%s/tw/MO/g")
+      feed_command("%s/tw/MO/g")
       expect(default_text:gsub("tw", "MO"))
-      execute("undo")
+      feed_command("undo")
       expect(default_text)
-      execute("undo")
+      feed_command("undo")
       expect(default_text:gsub("tw", "MO"))
     end
   end)
@@ -450,13 +451,13 @@ describe(":substitute, 'inccommand' preserves undo", function()
     for _, case in pairs(cases) do
       clear()
       common_setup(screen, case, default_text)
-      execute("set undolevels=1")
+      feed_command("set undolevels=1")
 
       feed("1G0")
       insert("X")
       feed("IY<esc>")
       feed(":%s/tw/MO/<esc>")
-      -- execute("undo") here would cause "Press ENTER".
+      -- feed_command("undo") here would cause "Press ENTER".
       feed("u")
       expect(default_text:gsub("Inc", "XInc"))
       feed("u")
@@ -508,13 +509,13 @@ describe(":substitute, 'inccommand' preserves undo", function()
     for _, case in pairs(cases) do
       clear()
       common_setup(screen, case, default_text)
-      execute("set undolevels=2")
+      feed_command("set undolevels=2")
 
       feed("2GAx<esc>")
       feed("Ay<esc>")
       feed("Az<esc>")
       feed(":%s/tw/AR<esc>")
-      -- using execute("undo") here will result in a "Press ENTER" prompt
+      -- feed_command("undo") here would cause "Press ENTER".
       feed("u")
       expect(default_text:gsub("lines", "linesxy"))
       feed("u")
@@ -601,9 +602,9 @@ describe(":substitute, 'inccommand' preserves undo", function()
       clear()
       common_setup(screen, case, default_text)
 
-      execute("set undolevels=-1")
+      feed_command("set undolevels=-1")
       feed(":%s/tw/MO/g<enter>")
-      -- using execute("undo") here will result in a "Press ENTER" prompt
+      -- feed_command("undo") here will result in a "Press ENTER" prompt
       feed("u")
       if case == "split" then
         screen:expect([[
@@ -637,7 +638,7 @@ describe(":substitute, 'inccommand' preserves undo", function()
       clear()
       common_setup(screen, case, default_text)
 
-      execute("set undolevels=-1")
+      feed_command("set undolevels=-1")
       feed("1G")
       feed("IL<esc>")
       feed(":%s/tw/MO/g<esc>")
@@ -676,7 +677,7 @@ describe(":substitute, inccommand=split", function()
   end)
 
   it("preserves 'modified' buffer flag", function()
-    execute("set nomodified")
+    feed_command("set nomodified")
     feed(":%s/tw")
     screen:expect([[
       Inc substitution on           |
@@ -804,7 +805,6 @@ describe(":substitute, inccommand=split", function()
   it('does not show split window for :s/', function()
     feed("2gg")
     feed(":s/tw")
-    wait()
     screen:expect([[
       Inc substitution on           |
       two lines                     |
@@ -825,7 +825,7 @@ describe(":substitute, inccommand=split", function()
   end)
 
   it("'hlsearch' is active, 'cursorline' is not", function()
-    execute("set hlsearch cursorline")
+    feed_command("set hlsearch cursorline")
     feed("gg")
 
     -- Assert that 'cursorline' is active.
@@ -917,7 +917,7 @@ describe(":substitute, inccommand=split", function()
     feed("gg")
     feed("2yy")
     feed("2000p")
-    execute("1,1000s/tw/BB/g")
+    feed_command("1,1000s/tw/BB/g")
 
     feed(":%s/tw/X")
     screen:expect([[
@@ -983,9 +983,9 @@ describe(":substitute, inccommand=split", function()
     -- Assert that 'inccommand' is ENABLED initially.
     eq("split", eval("&inccommand"))
     -- Set 'redrawtime' to minimal value, to ensure timeout is triggered.
-    execute("set redrawtime=1 nowrap")
+    feed_command("set redrawtime=1 nowrap")
     -- Load a big file.
-    execute("silent edit! test/functional/fixtures/bigfile.txt")
+    feed_command("silent edit! test/functional/fixtures/bigfile.txt")
     -- Start :substitute with a slow pattern.
     feed([[:%s/B.*N/x]])
     wait()
@@ -1018,7 +1018,7 @@ describe(":substitute, inccommand=split", function()
 
   it("clears preview if non-previewable command is edited #5585", function()
     -- Put a non-previewable command in history.
-    execute("echo 'foo'")
+    feed_command("echo 'foo'")
     -- Start an incomplete :substitute command.
     feed(":1,2s/t/X")
 
@@ -1079,7 +1079,7 @@ describe("inccommand=nosplit", function()
   end)
 
   it("works with :smagic, :snomagic", function()
-    execute("set hlsearch")
+    feed_command("set hlsearch")
     insert("Line *.3.* here")
 
     feed(":%smagic/3.*/X")    -- start :smagic command
@@ -1114,7 +1114,7 @@ describe("inccommand=nosplit", function()
   end)
 
   it('never shows preview buffer', function()
-    execute("set hlsearch")
+    feed_command("set hlsearch")
 
     feed(":%s/tw")
     screen:expect([[
@@ -1175,7 +1175,7 @@ describe("inccommand=nosplit", function()
 
   it("clears preview if non-previewable command is edited", function()
     -- Put a non-previewable command in history.
-    execute("echo 'foo'")
+    feed_command("echo 'foo'")
     -- Start an incomplete :substitute command.
     feed(":1,2s/t/X")
 
@@ -1224,7 +1224,7 @@ describe(":substitute, 'inccommand' with a failing expression", function()
   it('in the pattern does nothing', function()
     for _, case in pairs(cases) do
       refresh(case)
-      execute("set inccommand=" .. case)
+      feed_command("set inccommand=" .. case)
       feed(":silent! %s/tw\\(/LARD/<enter>")
       expect(default_text)
     end
@@ -1236,10 +1236,10 @@ describe(":substitute, 'inccommand' with a failing expression", function()
       local replacements = { "\\='LARD", "\\=xx_novar__xx" }
 
       for _, repl in pairs(replacements) do
-        execute("set inccommand=" .. case)
+        feed_command("set inccommand=" .. case)
         feed(":silent! %s/tw/" .. repl .. "/<enter>")
         expect(default_text:gsub("tw", ""))
-        execute("undo")
+        feed_command("undo")
       end
     end
   end)
@@ -1291,14 +1291,14 @@ describe("'inccommand' and :cnoremap", function()
   it('work with remapped characters', function()
     for _, case in pairs(cases) do
       refresh(case)
-      local command = "%s/lines/LINES/g"
+      local cmd = "%s/lines/LINES/g"
 
-      for i = 1, string.len(command) do
-        local c = string.sub(command, i, i)
-        execute("cnoremap ".. c .. " " .. c)
+      for i = 1, string.len(cmd) do
+        local c = string.sub(cmd, i, i)
+        feed_command("cnoremap ".. c .. " " .. c)
       end
 
-      execute(command)
+      feed_command(cmd)
       expect([[
         Inc substitution on
         two LINES
@@ -1309,7 +1309,7 @@ describe("'inccommand' and :cnoremap", function()
   it('work when mappings move the cursor', function()
     for _, case in pairs(cases) do
       refresh(case)
-      execute("cnoremap ,S LINES/<left><left><left><left><left><left>")
+      feed_command("cnoremap ,S LINES/<left><left><left><left><left><left>")
 
       feed(":%s/lines/,Sor three <enter>")
       expect([[
@@ -1317,21 +1317,21 @@ describe("'inccommand' and :cnoremap", function()
         two or three LINES
         ]])
 
-      execute("cnoremap ;S /X/<left><left><left>")
+      feed_command("cnoremap ;S /X/<left><left><left>")
       feed(":%s/;SI<enter>")
       expect([[
         Xnc substitution on
         two or three LXNES
         ]])
 
-      execute("cnoremap ,T //Y/<left><left><left>")
+      feed_command("cnoremap ,T //Y/<left><left><left>")
       feed(":%s,TX<enter>")
       expect([[
         Ync substitution on
         two or three LYNES
         ]])
 
-      execute("cnoremap ;T s//Z/<left><left><left>")
+      feed_command("cnoremap ;T s//Z/<left><left><left>")
       feed(":%;TY<enter>")
       expect([[
         Znc substitution on
@@ -1343,7 +1343,7 @@ describe("'inccommand' and :cnoremap", function()
   it('does not work with a failing mapping', function()
     for _, case in pairs(cases) do
       refresh(case)
-      execute("cnoremap <expr> x execute('bwipeout!')[-1].'x'")
+      feed_command("cnoremap <expr> x execute('bwipeout!')[-1].'x'")
 
       feed(":%s/tw/tox<enter>")
 
@@ -1356,7 +1356,7 @@ describe("'inccommand' and :cnoremap", function()
   it('work when temporarily moving the cursor', function()
     for _, case in pairs(cases) do
       refresh(case)
-      execute("cnoremap <expr> x cursor(1, 1)[-1].'x'")
+      feed_command("cnoremap <expr> x cursor(1, 1)[-1].'x'")
 
       feed(":%s/tw/tox/g<enter>")
       expect(default_text:gsub("tw", "tox"))
@@ -1366,7 +1366,7 @@ describe("'inccommand' and :cnoremap", function()
   it("work when a mapping disables 'inccommand'", function()
     for _, case in pairs(cases) do
       refresh(case)
-      execute("cnoremap <expr> x execute('set inccommand=')[-1]")
+      feed_command("cnoremap <expr> x execute('set inccommand=')[-1]")
 
       feed(":%s/tw/toxa/g<enter>")
       expect(default_text:gsub("tw", "toa"))
@@ -1440,7 +1440,7 @@ describe("'inccommand' autocommands", function()
 
   local function register_autocmd(event)
     meths.set_var(event .. "_fired", {})
-    execute("autocmd " .. event .. " * call add(g:" .. event .. "_fired, expand('<abuf>'))")
+    feed_command("autocmd " .. event .. " * call add(g:" .. event .. "_fired, expand('<abuf>'))")
   end
 
   it('are not fired when splitting', function()
@@ -1493,8 +1493,8 @@ describe("'inccommand' split windows", function()
     refresh()
 
     feed("gg")
-    execute("vsplit")
-    execute("split")
+    feed_command("vsplit")
+    feed_command("split")
     feed(":%s/tw")
     screen:expect([[
       Inc substitution on {10:|}Inc substitution on|
@@ -1530,9 +1530,9 @@ describe("'inccommand' split windows", function()
     ]])
 
     feed("<esc>")
-    execute("only")
-    execute("split")
-    execute("vsplit")
+    feed_command("only")
+    feed_command("split")
+    feed_command("vsplit")
 
     feed(":%s/tw")
     screen:expect([[
@@ -1581,7 +1581,7 @@ describe("'inccommand' split windows", function()
   it("are not affected by various settings", function()
     for _, setting in pairs(settings) do
       refresh()
-      execute("set " .. setting)
+      feed_command("set " .. setting)
 
       feed(":%s/tw")
 
diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua
index cec19250d2..29d974b709 100644
--- a/test/functional/ui/input_spec.lua
+++ b/test/functional/ui/input_spec.lua
@@ -1,5 +1,5 @@
 local helpers = require('test.functional.helpers')(after_each)
-local clear, execute, nvim = helpers.clear, helpers.execute, helpers.nvim
+local clear, feed_command, nvim = helpers.clear, helpers.feed_command, helpers.nvim
 local feed, next_message, eq = helpers.feed, helpers.next_message, helpers.eq
 local expect = helpers.expect
 local Screen = require('test.functional.ui.screen')
@@ -12,7 +12,7 @@ describe('mappings', function()
   local add_mapping = function(mapping, send)
     local cmd = "nnoremap "..mapping.." :call rpcnotify("..cid..", 'mapped', '"
                 ..send:gsub('<', '<lt>').."')<cr>"
-    execute(cmd)
+    feed_command(cmd)
   end
 
   local check_mapping = function(mapping, expected)
@@ -57,7 +57,7 @@ describe('feeding large chunks of input with <Paste>', function()
     clear()
     screen = Screen.new()
     screen:attach()
-    execute('set ruler')
+    feed_command('set ruler')
   end)
 
   it('ok', function()
diff --git a/test/functional/ui/mode_spec.lua b/test/functional/ui/mode_spec.lua
new file mode 100644
index 0000000000..f0cedfeeb5
--- /dev/null
+++ b/test/functional/ui/mode_spec.lua
@@ -0,0 +1,227 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local command, eval = helpers.command, helpers.eval
+local eq = helpers.eq
+
+describe('ui mode_change event', function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(25, 4)
+    screen:attach({rgb= true})
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {bold=true, reverse=true},
+      [2] = {bold=true},
+      [3] = {reverse=true},
+    })
+  end)
+
+  it('works in normal mode', function()
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+
+    feed('d')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("operator", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+
+  it('works in insert mode', function()
+    feed('i')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]],nil,nil,function ()
+      eq("insert", screen.mode)
+    end)
+
+    feed('word<esc>')
+    screen:expect([[
+      wor^d                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]], nil, nil, function ()
+      eq("normal", screen.mode)
+    end)
+
+    command("set showmatch")
+    eq(eval('&matchtime'), 5) -- tenths of seconds
+    feed('a(stuff')
+    screen:expect([[
+      word(stuff^               |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]], nil, nil, function ()
+      eq("insert", screen.mode)
+    end)
+
+    feed(')')
+    screen:expect([[
+      word^(stuff)              |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]], nil, nil, function ()
+      eq("showmatch", screen.mode)
+    end)
+
+    screen:sleep(400)
+    screen:expect([[
+      word(stuff)^              |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]], nil, nil, function ()
+      eq("insert", screen.mode)
+    end)
+  end)
+
+  it('works in replace mode', function()
+    feed('R')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- REPLACE --}            |
+    ]], nil, nil, function ()
+      eq("replace", screen.mode)
+    end)
+
+    feed('word<esc>')
+    screen:expect([[
+      wor^d                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]], nil, nil, function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+
+  it('works in cmdline mode', function()
+    feed(':')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :^                        |
+    ]],nil,nil,function ()
+      eq("cmdline_normal", screen.mode)
+    end)
+
+    feed('x<left>')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :^x                       |
+    ]],nil,nil,function ()
+      eq("cmdline_insert", screen.mode)
+    end)
+
+    feed('<insert>')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :^x                       |
+    ]],nil,nil,function ()
+      eq("cmdline_replace", screen.mode)
+    end)
+
+
+    feed('<right>')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :x^                       |
+    ]],nil,nil,function ()
+      eq("cmdline_normal", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+
+  it('works in visal mode', function()
+    insert("text")
+    feed('v')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]],nil,nil,function ()
+      eq("visual", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+
+    command('set selection=exclusive')
+    feed('v')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]],nil,nil,function ()
+      eq("visual_select", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+end)
+
diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua
index b2fbedfb5e..35af34015d 100644
--- a/test/functional/ui/mouse_spec.lua
+++ b/test/functional/ui/mouse_spec.lua
@@ -1,12 +1,12 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, meths = helpers.clear, helpers.feed, helpers.meths
-local insert, execute = helpers.insert, helpers.execute
+local insert, feed_command = helpers.insert, helpers.feed_command
 local eq, funcs = helpers.eq, helpers.funcs
 
 if helpers.pending_win32(pending) then return end
 
-describe('Mouse input', function()
+describe('ui/mouse/input', function()
   local screen
 
   before_each(function()
@@ -123,9 +123,9 @@ describe('Mouse input', function()
     end)
 
     it('in tabline on filler space moves tab to the end', function()
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -160,9 +160,9 @@ describe('Mouse input', function()
         return
       end
 
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -190,9 +190,9 @@ describe('Mouse input', function()
     end)
 
     it('in tabline to the right moves tab right', function()
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -220,9 +220,9 @@ describe('Mouse input', function()
     end)
 
     it('out of tabline under filler space moves tab to the end', function()
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -265,9 +265,9 @@ describe('Mouse input', function()
         return
       end
 
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -303,9 +303,9 @@ describe('Mouse input', function()
     end)
 
     it('out of tabline to the right moves tab right', function()
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -352,9 +352,9 @@ describe('Mouse input', function()
     end)
 
     it('left click in default tabline (position 4) switches to tab', function()
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -375,9 +375,9 @@ describe('Mouse input', function()
 
     it('left click in default tabline (position 24) closes tab', function()
       meths.set_option('hidden', true)
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -398,9 +398,9 @@ describe('Mouse input', function()
 
     it('double click in default tabline (position 4) opens new tab', function()
       meths.set_option('hidden', true)
-      execute('%delete')
+      feed_command('%delete')
       insert('this is foo')
-      execute('silent file foo | tabnew | file bar')
+      feed_command('silent file foo | tabnew | file bar')
       insert('this is bar')
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
@@ -421,13 +421,13 @@ describe('Mouse input', function()
 
     describe('%@ label', function()
       before_each(function()
-        execute([[
+        feed_command([[
           function Test(...)
             let g:reply = a:000
             return copy(a:000)  " Check for memory leaks: return should be freed
           endfunction
         ]])
-        execute([[
+        feed_command([[
           function Test2(...)
             return call('Test', a:000 + [2])
           endfunction
@@ -533,9 +533,9 @@ describe('Mouse input', function()
       fill = { reverse=true },
       vis  = { background=Screen.colors.LightGrey }
     })
-    execute('silent file foo | tabnew | file bar')
+    feed_command('silent file foo | tabnew | file bar')
     insert('this is bar')
-    execute('tabprevious')  -- go to first tab
+    feed_command('tabprevious')  -- go to first tab
     screen:expect([[
       {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
       mouse                    |
@@ -641,7 +641,7 @@ describe('Mouse input', function()
     mouse scrolling
     ]])
     screen:try_resize(53, 14)
-    execute('sp', 'vsp')
+    feed_command('sp', 'vsp')
     screen:expect([[
       lines                     {4:|}lines                     |
       to                        {4:|}to                        |
@@ -754,12 +754,12 @@ describe('Mouse input', function()
       })
       feed('ggdG')
 
-      execute('set concealcursor=n')
-      execute('set nowrap')
-      execute('syntax match NonText "\\<amet\\>" conceal')
-      execute('syntax match NonText "\\cs\\|g." conceal cchar=X')
-      execute('syntax match NonText "\\%(lo\\|cl\\)." conceal')
-      execute('syntax match NonText "Lo" conceal cchar=Y')
+      feed_command('set concealcursor=n')
+      feed_command('set nowrap')
+      feed_command('syntax match NonText "\\<amet\\>" conceal')
+      feed_command('syntax match NonText "\\cs\\|g." conceal cchar=X')
+      feed_command('syntax match NonText "\\%(lo\\|cl\\)." conceal')
+      feed_command('syntax match NonText "Lo" conceal cchar=Y')
 
       insert([[
       Lorem ipsum dolor sit amet, consetetur sadipscing elitr.
@@ -770,7 +770,7 @@ describe('Mouse input', function()
     end)
 
     it('(level 1) click on non-wrapped lines', function()
-      execute('let &conceallevel=1', 'echo')
+      feed_command('let &conceallevel=1', 'echo')
 
       feed('<esc><LeftMouse><0,0>')
       screen:expect([[
@@ -818,7 +818,7 @@ describe('Mouse input', function()
     end) -- level 1 - non wrapped
 
     it('(level 1) click on wrapped lines', function()
-      execute('let &conceallevel=1', 'let &wrap=1', 'echo')
+      feed_command('let &conceallevel=1', 'let &wrap=1', 'echo')
 
       feed('<esc><LeftMouse><0,0>')
       screen:expect([[
@@ -867,7 +867,7 @@ describe('Mouse input', function()
 
 
     it('(level 2) click on non-wrapped lines', function()
-      execute('let &conceallevel=2', 'echo')
+      feed_command('let &conceallevel=2', 'echo')
 
       feed('<esc><LeftMouse><0,0>')
       screen:expect([[
@@ -915,7 +915,7 @@ describe('Mouse input', function()
     end) -- level 2 - non wrapped
 
     it('(level 2) click on wrapped lines', function()
-      execute('let &conceallevel=2', 'let &wrap=1', 'echo')
+      feed_command('let &conceallevel=2', 'let &wrap=1', 'echo')
 
       feed('<esc><LeftMouse><0,0>')
       screen:expect([[
@@ -964,7 +964,7 @@ describe('Mouse input', function()
 
 
     it('(level 3) click on non-wrapped lines', function()
-      execute('let &conceallevel=3', 'echo')
+      feed_command('let &conceallevel=3', 'echo')
 
       feed('<esc><LeftMouse><0,0>')
       screen:expect([[
@@ -1012,7 +1012,7 @@ describe('Mouse input', function()
     end) -- level 3 - non wrapped
 
     it('(level 3) click on wrapped lines', function()
-      execute('let &conceallevel=3', 'let &wrap=1', 'echo')
+      feed_command('let &conceallevel=3', 'let &wrap=1', 'echo')
 
       feed('<esc><LeftMouse><0,0>')
       screen:expect([[
diff --git a/test/functional/ui/quickfix_spec.lua b/test/functional/ui/quickfix_spec.lua
index 29b28fe9f0..b0d89ee3b6 100644
--- a/test/functional/ui/quickfix_spec.lua
+++ b/test/functional/ui/quickfix_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, meths = helpers.clear, helpers.feed, helpers.meths
-local insert, execute = helpers.insert, helpers.execute
+local insert, command = helpers.insert, helpers.command
 
 
 describe('quickfix selection highlight', function()
@@ -28,8 +28,8 @@ describe('quickfix selection highlight', function()
     })
 
     meths.set_option('errorformat', '%m %l')
-    execute('syntax on')
-    execute('highlight Search guibg=Green')
+    command('syntax on')
+    command('highlight Search guibg=Green')
 
     insert([[
     Line 1
@@ -39,7 +39,7 @@ describe('quickfix selection highlight', function()
     Line 5
     ]])
 
-    execute('cad')
+    command('cad')
     feed('gg')
 
     screen:expect([[
@@ -52,12 +52,12 @@ describe('quickfix selection highlight', function()
       {1:~                        }|
       {1:~                        }|
       {1:~                        }|
-      :cad                     |
+                               |
     ]])
   end)
 
   it('using default Search highlight group', function()
-    execute('copen')
+    command('copen')
 
     screen:expect([[
       Line 1                   |
@@ -69,10 +69,10 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :copen                   |
+                               |
     ]])
 
-    execute('cnext')
+    command('cnext')
 
     screen:expect([[
       Line 1                   |
@@ -84,14 +84,14 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :cnext                   |
+                               |
     ]])
   end)
 
   it('using QuickFixLine highlight group', function()
-    execute('highlight QuickFixLine guibg=Red')
+    command('highlight QuickFixLine guibg=Red')
 
-    execute('copen')
+    command('copen')
 
     screen:expect([[
       Line 1                   |
@@ -103,10 +103,10 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :copen                   |
+                               |
     ]])
 
-    execute('cnext')
+    command('cnext')
 
     screen:expect([[
       Line 1                   |
@@ -118,16 +118,16 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :cnext                   |
+                               |
     ]])
   end)
 
   it('combines with CursorLine', function()
-    execute('set cursorline')
-    execute('highlight QuickFixLine guifg=Red')
-    execute('highlight CursorLine guibg=Fuchsia')
+    command('set cursorline')
+    command('highlight QuickFixLine guifg=Red')
+    command('highlight CursorLine guibg=Fuchsia')
 
-    execute('copen')
+    command('copen')
 
     screen:expect([[
       {9:Line 1                   }|
@@ -139,7 +139,7 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :copen                   |
+                               |
     ]])
 
     feed('j')
@@ -154,16 +154,16 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :copen                   |
+                               |
     ]])
   end)
 
   it('QuickFixLine background takes precedence over CursorLine', function()
-    execute('set cursorline')
-    execute('highlight QuickFixLine guibg=Red')
-    execute('highlight CursorLine guibg=Fuchsia')
+    command('set cursorline')
+    command('highlight QuickFixLine guibg=Red')
+    command('highlight CursorLine guibg=Fuchsia')
 
-    execute('copen')
+    command('copen')
 
     screen:expect([[
       {9:Line 1                   }|
@@ -175,7 +175,7 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :copen                   |
+                               |
     ]])
 
     feed('j')
@@ -190,7 +190,7 @@ describe('quickfix selection highlight', function()
       |{3:5}| Line                 |
       ||                       |
       {4:[Quickfix List]          }|
-      :copen                   |
+                               |
     ]])
   end)
 end)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 54f43387dc..7d9cd6c026 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -181,6 +181,7 @@ end
 -- expected:    Expected screen state (string). Each line represents a screen
 --              row. Last character of each row (typically "|") is stripped.
 --              Common indentation is stripped.
+--              Used as `condition` if NOT a string; must be the ONLY arg then.
 -- attr_ids:    Expected text attributes. Screen rows are transformed according
 --              to this table, as follows: each substring S composed of
 --              characters having the same attributes will be substituted by
@@ -191,18 +192,23 @@ end
 -- any:         true: Succeed if `expected` matches ANY screen line(s).
 --              false (default): `expected` must match screen exactly.
 function Screen:expect(expected, attr_ids, attr_ignore, condition, any)
-  -- remove the last line and dedent
-  expected = dedent(expected:gsub('\n[ ]+$', ''))
   local expected_rows = {}
-  for row in expected:gmatch('[^\n]+') do
-    -- the last character should be the screen delimiter
-    row = row:sub(1, #row - 1)
-    table.insert(expected_rows, row)
-  end
-  if not any then
-    assert(self._height == #expected_rows,
-      "Expected screen state's row count(" .. #expected_rows
-      .. ') differs from configured height(' .. self._height .. ') of Screen.')
+  if type(expected) ~= "string" then
+    assert(not (attr_ids or attr_ignore or condition or any))
+    condition = expected
+    expected = nil
+  else
+    -- Remove the last line and dedent.
+    expected = dedent(expected:gsub('\n[ ]+$', ''))
+    for row in expected:gmatch('[^\n]+') do
+      row = row:sub(1, #row - 1) -- Last char must be the screen delimiter.
+      table.insert(expected_rows, row)
+    end
+    if not any then
+      assert(self._height == #expected_rows,
+        "Expected screen state's row count(" .. #expected_rows
+        .. ') differs from configured height(' .. self._height .. ') of Screen.')
+    end
   end
   local ids = attr_ids or self._default_attr_ids
   local ignore = attr_ignore or self._default_attr_ignore
@@ -218,7 +224,9 @@ function Screen:expect(expected, attr_ids, attr_ignore, condition, any)
       actual_rows[i] = self:_row_repr(self._rows[i], ids, ignore)
     end
 
-    if any then
+    if expected == nil then
+      return
+    elseif any then
       -- Search for `expected` anywhere in the screen lines.
       local actual_screen_str = table.concat(actual_rows, '\n')
       if nil == string.find(actual_screen_str, expected) then
@@ -276,18 +284,13 @@ function Screen:wait(check, timeout)
 
   if failure_after_success then
     print([[
-Warning: Screen changes have been received after the expected state was seen.
-This is probably due to an indeterminism in the test. Try adding
-`wait()` (or even a separate `screen:expect(...)`) at a point of possible
-indeterminism, typically in between a `feed()` or `execute()` which is non-
-synchronous, and a synchronous api call.
-
-Note that sometimes a `wait` can trigger redraws and consequently generate more
-indeterminism. If adding `wait` calls seems to increase the frequency of these
-messages, try removing every `wait` call in the test.
-
-If everything else fails, use Screen:redraw_debug to help investigate what is
-  causing the problem.
+
+Warning: Screen changes were received after the expected state. This indicates
+indeterminism in the test. Try adding wait() (or screen:expect(...)) between
+asynchronous (feed(), nvim_input()) and synchronous API calls.
+  - Use Screen:redraw_debug() to investigate the problem.
+  - wait() can trigger redraws and consequently generate more indeterminism.
+    In that case try removing every wait().
       ]])
     local tb = debug.traceback()
     local index = string.find(tb, '\n%s*%[C]')
@@ -309,10 +312,13 @@ function Screen:_redraw(updates)
     -- print(require('inspect')(update))
     local method = update[1]
     for i = 2, #update do
-      local handler = self['_handle_'..method]
+      local handler_name = '_handle_'..method
+      local handler = self[handler_name]
       if handler ~= nil then
         handler(self, unpack(update[i]))
       else
+        assert(self._on_event,
+          "Add Screen:"..handler_name.." or call Screen:set_on_event_handler")
         self._on_event(method, update[i])
       end
     end
@@ -343,6 +349,11 @@ function Screen:_handle_resize(width, height)
   }
 end
 
+function Screen:_handle_mode_info_set(cursor_style_enabled, mode_info)
+  self._cursor_style_enabled = cursor_style_enabled
+  self._mode_info = mode_info
+end
+
 function Screen:_handle_clear()
   self:_clear_block(self._scroll_region.top, self._scroll_region.bot,
                     self._scroll_region.left, self._scroll_region.right)
@@ -374,9 +385,8 @@ function Screen:_handle_mouse_off()
   self._mouse_enabled = false
 end
 
-function Screen:_handle_mode_change(mode)
-  assert(mode == 'insert' or mode == 'replace'
-        or mode == 'normal' or mode == 'cmdline')
+function Screen:_handle_mode_change(mode, idx)
+  assert(mode == self._mode_info[idx+1].name)
   self.mode = mode
 end
 
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index e511234e5e..d9cb3d7b6f 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local spawn, set_session, clear = helpers.spawn, helpers.set_session, helpers.clear
-local feed, execute = helpers.feed, helpers.execute
+local feed, command = helpers.feed, helpers.command
 local insert = helpers.insert
 local eq = helpers.eq
 local eval = helpers.eval
@@ -73,33 +73,29 @@ describe('Screen', function()
   describe(':suspend', function()
     it('is forwarded to the UI', function()
       local function check()
-        if not screen.suspended then
-          return 'Screen was not suspended'
-        end
+        eq(true, screen.suspended)
       end
-      execute('suspend')
-      screen:wait(check)
+      command('suspend')
+      screen:expect(check)
       screen.suspended = false
       feed('<c-z>')
-      screen:wait(check)
+      screen:expect(check)
     end)
   end)
 
   describe('bell/visual bell', function()
     it('is forwarded to the UI', function()
       feed('<left>')
-      screen:wait(function()
-        if not screen.bell or screen.visual_bell then
-          return 'Bell was not sent'
-        end
+      screen:expect(function()
+        eq(true, screen.bell)
+        eq(false, screen.visual_bell)
       end)
       screen.bell = false
-      execute('set visualbell')
+      command('set visualbell')
       feed('<left>')
-      screen:wait(function()
-        if not screen.visual_bell or screen.bell then
-          return 'Visual bell was not sent'
-        end
+      screen:expect(function()
+        eq(true, screen.visual_bell)
+        eq(false, screen.bell)
       end)
     end)
   end)
@@ -107,36 +103,27 @@ describe('Screen', function()
   describe(':set title', function()
     it('is forwarded to the UI', function()
       local expected = 'test-title'
-      execute('set titlestring='..expected)
-      execute('set title')
-      screen:wait(function()
-        local actual = screen.title
-        if actual ~= expected then
-          return 'Expected title to be "'..expected..'" but was "'..actual..'"'
-        end
+      command('set titlestring='..expected)
+      command('set title')
+      screen:expect(function()
+        eq(expected, screen.title)
       end)
     end)
 
     it('has correct default title with unnamed file', function()
       local expected = '[No Name] - NVIM'
-      execute('set title')
-      screen:wait(function()
-        local actual = screen.title
-        if actual ~= expected then
-          return 'Expected title to be "'..expected..'" but was "'..actual..'"'
-        end
+      command('set title')
+      screen:expect(function()
+        eq(expected, screen.title)
       end)
     end)
 
     it('has correct default title with named file', function()
       local expected = 'myfile (/mydir) - NVIM'
-      execute('set title')
-      execute('file /mydir/myfile')
-      screen:wait(function()
-        local actual = screen.title
-        if actual ~= expected then
-          return 'Expected title to be "'..expected..'" but was "'..actual..'"'
-        end
+      command('set title')
+      command('file /mydir/myfile')
+      screen:expect(function()
+        eq(expected, screen.title)
       end)
     end)
   end)
@@ -144,13 +131,10 @@ describe('Screen', function()
   describe(':set icon', function()
     it('is forwarded to the UI', function()
       local expected = 'test-icon'
-      execute('set iconstring='..expected)
-      execute('set icon')
-      screen:wait(function()
-        local actual = screen.icon
-        if actual ~= expected then
-          return 'Expected title to be "'..expected..'" but was "'..actual..'"'
-        end
+      command('set iconstring='..expected)
+      command('set icon')
+      screen:expect(function()
+        eq(expected, screen.icon)
       end)
     end)
   end)
@@ -158,7 +142,7 @@ describe('Screen', function()
   describe('window', function()
     describe('split', function()
       it('horizontal', function()
-        execute('sp')
+        command('sp')
         screen:expect([[
           ^                                                     |
           {0:~                                                    }|
@@ -173,13 +157,13 @@ describe('Screen', function()
           {0:~                                                    }|
           {0:~                                                    }|
           {3:[No Name]                                            }|
-          :sp                                                  |
+                                                               |
         ]])
       end)
 
       it('horizontal and resize', function()
-        execute('sp')
-        execute('resize 8')
+        command('sp')
+        command('resize 8')
         screen:expect([[
           ^                                                     |
           {0:~                                                    }|
@@ -194,12 +178,14 @@ describe('Screen', function()
           {0:~                                                    }|
           {0:~                                                    }|
           {3:[No Name]                                            }|
-          :resize 8                                            |
+                                                               |
         ]])
       end)
 
       it('horizontal and vertical', function()
-        execute('sp', 'vsp', 'vsp')
+        command('sp')
+        command('vsp')
+        command('vsp')
         screen:expect([[
           ^                    {3:|}                {3:|}               |
           {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
@@ -239,7 +225,9 @@ describe('Screen', function()
 
   describe('tabnew', function()
     it('creates a new buffer', function()
-      execute('sp', 'vsp', 'vsp')
+      command('sp')
+      command('vsp')
+      command('vsp')
       insert('hello')
       screen:expect([[
         hell^o               {3:|}hello           {3:|}hello          |
@@ -257,7 +245,7 @@ describe('Screen', function()
         {3:[No Name] [+]                                        }|
                                                              |
       ]])
-      execute('tabnew')
+      command('tabnew')
       insert('hello2')
       feed('h')
       screen:expect([[
@@ -276,7 +264,7 @@ describe('Screen', function()
         {0:~                                                    }|
                                                              |
       ]])
-      execute('tabprevious')
+      command('tabprevious')
       screen:expect([[
         {2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3:                         }{4:X}|
         hell^o               {3:|}hello           {3:|}hello          |
@@ -321,9 +309,9 @@ describe('Screen', function()
   describe('normal mode', function()
     -- https://code.google.com/p/vim/issues/detail?id=339
     it("setting 'ruler' doesn't reset the preferred column", function()
-      execute('set virtualedit=')
+      command('set virtualedit=')
       feed('i0123456<cr>789<esc>kllj')
-      execute('set ruler')
+      command('set ruler')
       feed('k')
       screen:expect([[
         0123^456                                              |
@@ -339,7 +327,7 @@ describe('Screen', function()
         {0:~                                                    }|
         {0:~                                                    }|
         {0:~                                                    }|
-        :set ruler                         1,5           All |
+                                           1,5           All |
       ]])
     end)
   end)
@@ -404,7 +392,9 @@ describe('Screen', function()
       split
       windows
       ]])
-      execute('sp', 'vsp', 'vsp')
+      command('sp')
+      command('vsp')
+      command('vsp')
       screen:expect([[
         and                 {3:|}and             {3:|}and            |
         clearing            {3:|}clearing        {3:|}clearing       |
@@ -576,119 +566,6 @@ describe('Screen', function()
     end)
   end)
 
-  describe('mode change', function()
-    before_each(function()
-      screen:try_resize(25, 5)
-    end)
-
-    it('works in normal mode', function()
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]],nil,nil,function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-
-    it('works in insert mode', function()
-      feed('i')
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        {2:-- INSERT --}             |
-      ]],nil,nil,function ()
-        eq("insert", screen.mode)
-      end)
-
-      feed('word<esc>')
-      screen:expect([[
-        wor^d                     |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]], nil, nil, function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-
-    it('works in replace mode', function()
-      feed('R')
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        {2:-- REPLACE --}            |
-      ]], nil, nil, function ()
-        eq("replace", screen.mode)
-      end)
-
-      feed('word<esc>')
-      screen:expect([[
-        wor^d                     |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]], nil, nil, function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-
-    it('works in cmdline mode', function()
-      feed(':')
-      screen:expect([[
-                                 |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        :^                        |
-      ]],nil,nil,function ()
-        eq("cmdline", screen.mode)
-      end)
-
-      feed('<esc>/')
-      screen:expect([[
-                                 |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        /^                        |
-      ]],nil,nil,function ()
-        eq("cmdline", screen.mode)
-      end)
-
-
-      feed('<esc>?')
-      screen:expect([[
-                                 |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        ?^                        |
-      ]],nil,nil,function ()
-        eq("cmdline", screen.mode)
-      end)
-
-      feed('<esc>')
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]],nil,nil,function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-  end)
-
   it('nvim_ui_attach() handles very large width/height #2180', function()
     screen:detach()
     screen = Screen.new(999, 999)
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index 3914648e8f..11b18d015f 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local execute = helpers.execute
+local feed_command = helpers.feed_command
 
 if helpers.pending_win32(pending) then return end
 
@@ -22,7 +22,7 @@ describe('search highlighting', function()
   end)
 
   it('is disabled by ":set nohlsearch"', function()
-    execute('set nohlsearch')
+    feed_command('set nohlsearch')
     insert("some text\nmore text")
     feed("gg/text<cr>")
     screen:expect([[
@@ -79,7 +79,7 @@ describe('search highlighting', function()
       /\<text\>                               |
     ]])
 
-    execute("nohlsearch")
+    feed_command("nohlsearch")
     screen:expect([[
         some text                             |
         more textstuff                        |
@@ -92,8 +92,8 @@ describe('search highlighting', function()
   end)
 
   it('works with incsearch', function()
-    execute('set hlsearch')
-    execute('set incsearch')
+    feed_command('set hlsearch')
+    feed_command('set incsearch')
     insert([[
       the first line
       in a little file
@@ -156,8 +156,8 @@ describe('search highlighting', function()
   end)
 
   it('works with incsearch and offset', function()
-    execute('set hlsearch')
-    execute('set incsearch')
+    feed_command('set hlsearch')
+    feed_command('set incsearch')
     insert([[
       not the match you're looking for
       the match is here]])
@@ -198,7 +198,7 @@ describe('search highlighting', function()
   end)
 
   it('works with multiline regexps', function()
-    execute('set hlsearch')
+    feed_command('set hlsearch')
     feed('4oa  repeated line<esc>')
     feed('/line\\na<cr>')
     screen:expect([[
@@ -234,19 +234,19 @@ describe('search highlighting', function()
         [6] = {italic = true, background = colors.Magenta},
         [7] = {bold = true, background = colors.Yellow},
     } )
-    execute('set hlsearch')
+    feed_command('set hlsearch')
     insert([[
       very special text
     ]])
-    execute("syntax on")
-    execute("highlight MyGroup guibg=Green gui=bold")
-    execute("highlight MyGroup2 guibg=Magenta gui=italic")
-    execute("call matchadd('MyGroup', 'special')")
-    execute("call matchadd('MyGroup2', 'text', 0)")
+    feed_command("syntax on")
+    feed_command("highlight MyGroup guibg=Green gui=bold")
+    feed_command("highlight MyGroup2 guibg=Magenta gui=italic")
+    feed_command("call matchadd('MyGroup', 'special')")
+    feed_command("call matchadd('MyGroup2', 'text', 0)")
 
     -- searchhl and matchadd matches are exclusive, only the higest priority
     -- is used (and matches with lower priorities are not combined)
-    execute("/ial te")
+    feed_command("/ial te")
     screen:expect([[
         very {5:spec^ial}{2: te}{6:xt}                     |
                                               |
@@ -257,7 +257,7 @@ describe('search highlighting', function()
       {4:search hit BOTTOM, continuing at TOP}    |
     ]])
 
-    execute("call clearmatches()")
+    feed_command("call clearmatches()")
     screen:expect([[
         very spec{2:^ial te}xt                     |
                                               |
@@ -270,7 +270,7 @@ describe('search highlighting', function()
 
     -- searchhl has priority over syntax, but in this case
     -- nonconflicting attributes are combined
-    execute("syntax keyword MyGroup special")
+    feed_command("syntax keyword MyGroup special")
     screen:expect([[
         very {5:spec}{7:^ial}{2: te}xt                     |
                                               |
diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua
index d02fc83809..e5c96f2ec0 100644
--- a/test/functional/ui/sign_spec.lua
+++ b/test/functional/ui/sign_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
+local clear, feed, command = helpers.clear, helpers.feed, helpers.command
 
 if helpers.pending_win32(pending) then return end
 
@@ -25,11 +25,11 @@ describe('Signs', function()
   describe(':sign place', function()
     it('shadows previously placed signs', function()
       feed('ia<cr>b<cr>c<cr><esc>')
-      execute('sign define piet text=>> texthl=Search')
-      execute('sign define pietx text=>! texthl=Search')
-      execute('sign place 1 line=1 name=piet buffer=1')
-      execute('sign place 2 line=3 name=piet buffer=1')
-      execute('sign place 3 line=1 name=pietx buffer=1')
+      command('sign define piet text=>> texthl=Search')
+      command('sign define pietx text=>! texthl=Search')
+      command('sign place 1 line=1 name=piet buffer=1')
+      command('sign place 2 line=3 name=piet buffer=1')
+      command('sign place 3 line=1 name=pietx buffer=1')
       screen:expect([[
         {1:>!}a                                                  |
         {2:  }b                                                  |
@@ -44,7 +44,7 @@ describe('Signs', function()
         {2:  }{0:~                                                  }|
         {2:  }{0:~                                                  }|
         {2:  }{0:~                                                  }|
-        :sign place 3 line=1 name=pietx buffer=1             |
+                                                             |
       ]])
     end)
   end)
diff --git a/test/functional/ui/syntax_conceal_spec.lua b/test/functional/ui/syntax_conceal_spec.lua
index ee3e4fa32a..28a104360d 100644
--- a/test/functional/ui/syntax_conceal_spec.lua
+++ b/test/functional/ui/syntax_conceal_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
+local clear, feed, command = helpers.clear, helpers.feed, helpers.command
 local insert = helpers.insert
 
 if helpers.pending_win32(pending) then return end
@@ -25,7 +25,7 @@ describe('Screen', function()
   describe("match and conceal", function()
 
     before_each(function()
-      execute("let &conceallevel=1")
+      command("let &conceallevel=1")
     end)
 
     describe("multiple", function()
@@ -38,7 +38,7 @@ describe('Screen', function()
           &&
           &&
           ]])
-        execute("syn match dAmpersand '[&][&]' conceal cchar=∧")
+        command("syn match dAmpersand '[&][&]' conceal cchar=∧")
       end)
 
       it("double characters.", function()
@@ -52,7 +52,7 @@ describe('Screen', function()
             ^                                                     |
             {0:~                                                    }|
             {0:~                                                    }|
-            :syn match dAmpersand '[&][&]' conceal cchar=∧       |
+                                                                 |
           ]])
       end)
 
@@ -68,7 +68,7 @@ describe('Screen', function()
                                                                |
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn match dAmpersand '[&][&]' conceal cchar=∧       |
+                                                               |
         ]])
       end)
 
@@ -84,7 +84,7 @@ describe('Screen', function()
                                                                |
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn match dAmpersand '[&][&]' conceal cchar=∧       |
+                                                               |
         ]])
       end)
 
@@ -100,7 +100,7 @@ describe('Screen', function()
                                                                |
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn match dAmpersand '[&][&]' conceal cchar=∧       |
+                                                               |
         ]])
       end)
 
@@ -116,15 +116,15 @@ describe('Screen', function()
           ^                                                     |
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn match dAmpersand '[&][&]' conceal cchar=∧       |
+                                                               |
         ]])
       end)
     end) -- multiple
 
     it("keyword instances in initially in the document.", function()
       feed("2ilambda<cr><ESC>")
-      execute("let &conceallevel=1")
-      execute("syn keyword kLambda lambda conceal cchar=λ")
+      command("let &conceallevel=1")
+      command("syn keyword kLambda lambda conceal cchar=λ")
       screen:expect([[
         {1:λ}                                                    |
         {1:λ}                                                    |
@@ -135,7 +135,7 @@ describe('Screen', function()
         {0:~                                                    }|
         {0:~                                                    }|
         {0:~                                                    }|
-        :syn keyword kLambda lambda conceal cchar=λ          |
+                                                             |
       ]])
     end) -- Keyword
 
@@ -144,11 +144,11 @@ describe('Screen', function()
       before_each(function()
         feed("2")
         insert("<r> a region of text </r>\n")
-        execute("let &conceallevel=1")
+        command("let &conceallevel=1")
       end)
 
       it('initially and conceal it.', function()
-        execute("syn region rText start='<r>' end='</r>' conceal cchar=R")
+        command("syn region rText start='<r>' end='</r>' conceal cchar=R")
         screen:expect([[
           {1:R}                                                    |
           {1:R}                                                    |
@@ -166,7 +166,7 @@ describe('Screen', function()
       it('initially and conceal its start tag and end tag.', function()
         -- concealends has a known bug (todo.txt) where the first match won't
         -- be replaced with cchar.
-        execute("syn region rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
+        command("syn region rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
         screen:expect([[
           {1: } a region of text {1:-}                                 |
           {1: } a region of text {1:-}                                 |
@@ -182,7 +182,7 @@ describe('Screen', function()
       end)
 
       it('that are nested and conceal the nested region\'s start and end tags.', function()
-        execute("syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
+        command("syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
         insert("<r> A region with <r> a nested <r> nested region.</r> </r> </r>\n")
         screen:expect([[
           {1: } a region of text {1:-}                                 |
@@ -201,10 +201,10 @@ describe('Screen', function()
 
     describe("a region of text", function()
       before_each(function()
-        execute("syntax conceal on")
+        command("syntax conceal on")
         feed("2")
         insert("<r> a region of text </r>\n")
-        execute("syn region rText start='<r>' end='</r>' cchar=-")
+        command("syn region rText start='<r>' end='</r>' cchar=-")
       end)
 
       it("and turn on implicit concealing", function()
@@ -218,15 +218,15 @@ describe('Screen', function()
           {0:~                                                    }|
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn region rText start='<r>' end='</r>' cchar=-     |
+                                                               |
         ]])
       end)
 
       it("and then turn on, then off, and then back on implicit concealing.", function()
-        execute("syntax conceal off")
+        command("syntax conceal off")
         feed("2")
         insert("<i> italian text </i>\n")
-        execute("syn region iText start='<i>' end='</i>' cchar=*")
+        command("syn region iText start='<i>' end='</i>' cchar=*")
         screen:expect([[
           {1:-}                                                    |
           {1:-}                                                    |
@@ -237,10 +237,10 @@ describe('Screen', function()
           {0:~                                                    }|
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn region iText start='<i>' end='</i>' cchar=*     |
+                                                               |
         ]])
-        execute("syntax conceal on")
-        execute("syn region iText start='<i>' end='</i>' cchar=*")
+        command("syntax conceal on")
+        command("syn region iText start='<i>' end='</i>' cchar=*")
         screen:expect([[
           {1:-}                                                    |
           {1:-}                                                    |
@@ -251,7 +251,7 @@ describe('Screen', function()
           {0:~                                                    }|
           {0:~                                                    }|
           {0:~                                                    }|
-          :syn region iText start='<i>' end='</i>' cchar=*     |
+                                                               |
         ]])
       end)
     end) -- a region of text (implicit concealing)
@@ -262,13 +262,13 @@ describe('Screen', function()
       insert("// No Conceal\n")
       insert('"Conceal without a cchar"\n')
       insert("+ With cchar\n\n")
-      execute("syn match noConceal '^//.*$'")
-      execute("syn match concealNoCchar '\".\\{-}\"$' conceal")
-      execute("syn match concealWCchar '^+.\\{-}$' conceal cchar=C")
+      command("syn match noConceal '^//.*$'")
+      command("syn match concealNoCchar '\".\\{-}\"$' conceal")
+      command("syn match concealWCchar '^+.\\{-}$' conceal cchar=C")
     end)
 
     it("0. No concealing.", function()
-      execute("let &conceallevel=0")
+      command("let &conceallevel=0")
       screen:expect([[
         // No Conceal                                        |
         "Conceal without a cchar"                            |
@@ -279,12 +279,12 @@ describe('Screen', function()
         {0:~                                                    }|
         {0:~                                                    }|
         {0:~                                                    }|
-        :let &conceallevel=0                                 |
+                                                             |
       ]])
     end)
 
     it("1. Conceal using cchar or reference listchars.", function()
-      execute("let &conceallevel=1")
+      command("let &conceallevel=1")
       screen:expect([[
         // No Conceal                                        |
         {1: }                                                    |
@@ -295,12 +295,12 @@ describe('Screen', function()
         {0:~                                                    }|
         {0:~                                                    }|
         {0:~                                                    }|
-        :let &conceallevel=1                                 |
+                                                             |
       ]])
     end)
 
     it("2. Hidden unless cchar is set.", function()
-      execute("let &conceallevel=2")
+      command("let &conceallevel=2")
       screen:expect([[
         // No Conceal                                        |
                                                              |
@@ -311,12 +311,12 @@ describe('Screen', function()
         {0:~                                                    }|
         {0:~                                                    }|
         {0:~                                                    }|
-        :let &conceallevel=2                                 |
+                                                             |
       ]])
     end)
 
     it("3. Hide all concealed text.", function()
-      execute("let &conceallevel=3")
+      command("let &conceallevel=3")
       screen:expect([[
         // No Conceal                                        |
                                                              |
@@ -327,7 +327,7 @@ describe('Screen', function()
         {0:~                                                    }|
         {0:~                                                    }|
         {0:~                                                    }|
-        :let &conceallevel=3                                 |
+                                                             |
       ]])
     end)
   end) -- conceallevel
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index 6a6dc99c3d..6639bf272d 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
+local clear, feed, command = helpers.clear, helpers.feed, helpers.command
 local funcs = helpers.funcs
 
 if helpers.pending_win32(pending) then return end
@@ -20,8 +20,8 @@ describe("'wildmode'", function()
 
   describe("'wildmenu'", function()
     it(':sign <tab> shows wildmenu completions', function()
-      execute('set wildmode=full')
-      execute('set wildmenu')
+      command('set wildmode=full')
+      command('set wildmenu')
       feed(':sign <tab>')
       screen:expect([[
                                  |
@@ -50,10 +50,10 @@ describe('command line completion', function()
 
   it('lists directories with empty PATH', function()
     local tmp = funcs.tempname()
-    execute('e '.. tmp)
-    execute('cd %:h')
-    execute("call mkdir('Xtest-functional-viml-compl-dir')")
-    execute('let $PATH=""')
+    command('e '.. tmp)
+    command('cd %:h')
+    command("call mkdir('Xtest-functional-viml-compl-dir')")
+    command('let $PATH=""')
     feed(':!<tab><bs>')
     screen:expect([[
                                               |