1 files changed, 19 insertions, 16 deletions
diff --git a/test/functional/options/pastetoggle_spec.lua b/test/functional/options/pastetoggle_spec.lua
index ec3c60fe37..a1f86f73ff 100644
--- a/test/functional/options/pastetoggle_spec.lua
+++ b/test/functional/options/pastetoggle_spec.lua
@@ -6,32 +6,35 @@ local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
 local sleep = helpers.sleep
+local expect = helpers.expect
 
 describe("'pastetoggle' option", function()
   before_each(function()
     clear()
     command('set nopaste')
-    command('set pastetoggle=a')
   end)
+
   it("toggles 'paste'", function()
-    eq(eval('&paste'), 0)
+    command('set pastetoggle=a')
+    eq(0, eval('&paste'))
     feed('a')
     -- Need another key so that the vgetorpeek() function returns.
     feed('j')
-    eq(eval('&paste'), 1)
+    eq(1, eval('&paste'))
   end)
-  it("multiple key 'pastetoggle' is waited for", function()
-    eq(eval('&paste'), 0)
-    local pastetoggle = 'lllll'
-    command('set pastetoggle=' .. pastetoggle)
-    command('set timeoutlen=1 ttimeoutlen=10000')
-    feed(pastetoggle:sub(0, 2))
-    -- sleep() for long enough that vgetorpeek() is gotten into, but short
-    -- enough that ttimeoutlen is not reached.
-    sleep(200)
-    feed(pastetoggle:sub(3, -1))
-    -- Need another key so that the vgetorpeek() function returns.
-    feed('j')
-    eq(eval('&paste'), 1)
+
+
+  it('does not wait for timeout', function()
+    command('set pastetoggle=abc')
+    command('set ttimeoutlen=9999999')
+    eq(0, eval('&paste'))
+    -- n.b. need <esc> to return from vgetorpeek()
+    feed('abc<esc>')
+    eq(1, eval('&paste'))
+    feed('ab')
+    sleep(10)
+    feed('c<esc>')
+    expect('bc')
+    eq(1, eval('&paste'))
   end)
 end)