2 files changed, 75 insertions, 2 deletions
diff --git a/test/functional/ex_cmds/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua
index 5c67431221..e5c9a20db3 100644
--- a/test/functional/ex_cmds/dict_notifications_spec.lua
+++ b/test/functional/ex_cmds/dict_notifications_spec.lua
@@ -371,4 +371,79 @@ describe('VimL dictionary notifications', function()
     eq(1, eval('g:called'))
   end)
 
+  it('does not crash when using dictwatcherdel in callback', function()
+    source([[
+      let g:d = {}
+
+      function! W1(...)
+        " Delete current and following watcher.
+        call dictwatcherdel(g:d, '*', function('W1'))
+        call dictwatcherdel(g:d, '*', function('W2'))
+        try
+          call dictwatcherdel({}, 'meh', function('tr'))
+        catch
+          let g:exc = v:exception
+        endtry
+      endfunction
+      call dictwatcheradd(g:d, '*', function('W1'))
+
+      function! W2(...)
+      endfunction
+      call dictwatcheradd(g:d, '*', function('W2'))
+
+      let g:d.foo = 23
+    ]])
+    eq(23, eval('g:d.foo'))
+    eq("Vim(call):Couldn't find a watcher matching key and callback", eval('g:exc'))
+  end)
+
+  it('does not call watcher added in callback', function()
+    source([[
+      let g:d = {}
+      let g:calls = []
+
+      function! W1(...) abort
+        call add(g:calls, 'W1')
+        call dictwatcheradd(g:d, '*', function('W2'))
+      endfunction
+
+      function! W2(...) abort
+        call add(g:calls, 'W2')
+      endfunction
+
+      call dictwatcheradd(g:d, '*', function('W1'))
+      let g:d.foo = 23
+    ]])
+    eq(23, eval('g:d.foo'))
+    eq({"W1"}, eval('g:calls'))
+  end)
+
+  it('calls watcher deleted in callback', function()
+    source([[
+      let g:d = {}
+      let g:calls = []
+
+      function! W1(...) abort
+        call add(g:calls, "W1")
+        call dictwatcherdel(g:d, '*', function('W2'))
+      endfunction
+
+      function! W2(...) abort
+        call add(g:calls, "W2")
+      endfunction
+
+      call dictwatcheradd(g:d, '*', function('W1'))
+      call dictwatcheradd(g:d, '*', function('W2'))
+      let g:d.foo = 123
+
+      unlet g:d
+      let g:d = {}
+      call dictwatcheradd(g:d, '*', function('W2'))
+      call dictwatcheradd(g:d, '*', function('W1'))
+      let g:d.foo = 123
+    ]])
+    eq(123, eval('g:d.foo'))
+    eq({"W1", "W2", "W2", "W1"}, eval('g:calls'))
+  end)
+
 end)
diff --git a/test/functional/ex_cmds/excmd_spec.lua b/test/functional/ex_cmds/excmd_spec.lua
index aac2a9f469..33794eb50d 100644
--- a/test/functional/ex_cmds/excmd_spec.lua
+++ b/test/functional/ex_cmds/excmd_spec.lua
@@ -24,8 +24,6 @@ describe('Ex cmds', function()
       pcall_err(command, ':menu 9999999999999999999999999999999999999999'))
     eq('Vim(bdelete):E939: Positive count required',
       pcall_err(command, ':bdelete 9999999999999999999999999999999999999999'))
-    eq('Vim(retab):E487: Argument must be positive',
-      pcall_err(command, ':retab 9999999999999999999999999999999999999999'))
     assert_alive()
   end)
 end)