2 files changed, 56 insertions, 3 deletions
diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua
index 45a01be620..a8f538b951 100644
--- a/test/functional/api/extmark_spec.lua
+++ b/test/functional/api/extmark_spec.lua
@@ -420,7 +420,7 @@ describe('API/extmarks', function()
   end)
 
   it('marks move with open line', function()
-    -- open_line in misc1.c
+    -- open_line in change.c
     -- testing marks below are also moved
     feed("yyP")
     set_extmark(ns, marks[1], 0, 4)
@@ -489,7 +489,7 @@ describe('API/extmarks', function()
   end)
 
   it('marks move with line splits (using enter)', function()
-    -- open_line in misc1.c
+    -- open_line in change.c
     -- testing marks below are also moved
     feed("yyP")
     set_extmark(ns, marks[1], 0, 4)
@@ -500,7 +500,7 @@ describe('API/extmarks', function()
   end)
 
   it('marks at last line move on insert new line', function()
-    -- open_line in misc1.c
+    -- open_line in change.c
     set_extmark(ns, marks[1], 0, 4)
     feed('0i<cr><esc>')
     check_undo_redo(ns, marks[1], 0, 4, 1, 4)
diff --git a/test/functional/autocmd/searchwrapped_spec.lua b/test/functional/autocmd/searchwrapped_spec.lua
new file mode 100644
index 0000000000..46c2c99b3d
--- /dev/null
+++ b/test/functional/autocmd/searchwrapped_spec.lua
@@ -0,0 +1,53 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local command = helpers.command
+local curbufmeths = helpers.curbufmeths
+local eq = helpers.eq
+local eval = helpers.eval
+local feed = helpers.feed
+
+describe('autocmd SearchWrapped', function()
+  before_each(function()
+    clear()
+    command('set ignorecase')
+    command('let g:test = 0')
+    command('autocmd! SearchWrapped * let g:test += 1')
+    curbufmeths.set_lines(0, 1, false, {
+      'The quick brown fox',
+      'jumps over the lazy dog'})
+  end)
+
+  it('gets triggered when search wraps the end', function()
+    feed('/the<Return>')
+    eq(0, eval('g:test'))
+
+    feed('n')
+    eq(1, eval('g:test'))
+
+    feed('nn')
+    eq(2, eval('g:test'))
+  end)
+
+  it('gets triggered when search wraps in reverse order', function()
+    feed('/the<Return>')
+    eq(0, eval('g:test'))
+
+    feed('NN')
+    eq(1, eval('g:test'))
+
+    feed('NN')
+    eq(2, eval('g:test'))
+  end)
+
+  it('does not get triggered on failed searches', function()
+    feed('/blargh<Return>')
+    eq(0, eval('g:test'))
+
+    feed('NN')
+    eq(0, eval('g:test'))
+
+    feed('NN')
+    eq(0, eval('g:test'))
+  end)
+end)