Merge branch 'master' into option-fixes

1 files changed, 24 insertions, 22 deletions

diff --git a/test/functional/legacy/075_maparg_spec.lua b/test/functional/legacy/075_maparg_spec.lua
index e9d2acdaf5..fcfd33ec46 100644
--- a/test/functional/legacy/075_maparg_spec.lua
+++ b/test/functional/legacy/075_maparg_spec.lua
@@ -3,46 +3,48 @@
 
 local helpers = require('test.functional.helpers')(after_each)
 local clear, feed = helpers.clear, helpers.feed
-local execute, expect = helpers.execute, helpers.expect
+local command, expect = helpers.command, helpers.expect
+local wait = helpers.wait
 
 describe('maparg()', function()
   setup(clear)
 
   it('is working', function()
-    execute('set cpo-=<')
+    command('set cpo-=<')
 
     -- Test maparg() with a string result
-    execute('map foo<C-V> is<F4>foo')
-    execute('vnoremap <script> <buffer> <expr> <silent> bar isbar')
-    execute([[call append('$', maparg('foo<C-V>'))]])
-    execute([[call append('$', string(maparg('foo<C-V>', '', 0, 1)))]])
-    execute([[call append('$', string(maparg('bar', '', 0, 1)))]])
-    execute('map <buffer> <nowait> foo bar')
-    execute([[call append('$', string(maparg('foo', '', 0, 1)))]])
-    execute('map abc x<char-114>x')
-    execute([[call append('$', maparg('abc'))]])
-    execute('map abc y<S-char-114>y')
-    execute([[call append('$', maparg('abc'))]])
+    command('map foo<C-V> is<F4>foo')
+    command('vnoremap <script> <buffer> <expr> <silent> bar isbar')
+    command([[call append('$', maparg('foo<C-V>'))]])
+    command([[call append('$', string(maparg('foo<C-V>', '', 0, 1)))]])
+    command([[call append('$', string(maparg('bar', '', 0, 1)))]])
+    command('map <buffer> <nowait> foo bar')
+    command([[call append('$', string(maparg('foo', '', 0, 1)))]])
+    command('map abc x<char-114>x')
+    command([[call append('$', maparg('abc'))]])
+    command('map abc y<S-char-114>y')
+    command([[call append('$', maparg('abc'))]])
     feed('Go<esc>:<cr>')
+    wait()
 
     -- Outside of the range, minimum
-    execute('inoremap <Char-0x1040> a')
-    execute([[execute "normal a\u1040\<Esc>"]])
+    command('inoremap <Char-0x1040> a')
+    command([[execute "normal a\u1040\<Esc>"]])
 
     -- Inside of the range, minimum
-    execute('inoremap <Char-0x103f> b')
-    execute([[execute "normal a\u103f\<Esc>"]])
+    command('inoremap <Char-0x103f> b')
+    command([[execute "normal a\u103f\<Esc>"]])
 
     -- Inside of the range, maximum
-    execute('inoremap <Char-0xf03f> c')
-    execute([[execute "normal a\uf03f\<Esc>"]])
+    command('inoremap <Char-0xf03f> c')
+    command([[execute "normal a\uf03f\<Esc>"]])
 
     -- Outside of the range, maximum
-    execute('inoremap <Char-0xf040> d')
-    execute([[execute "normal a\uf040\<Esc>"]])
+    command('inoremap <Char-0xf040> d')
+    command([[execute "normal a\uf040\<Esc>"]])
 
     -- Remove empty line
-    execute('1d')
+    command('1d')
 
     -- Assert buffer contents.
     expect([[