patch 7.4.1645
Problem: When a dict contains a partial it can't be redefined as a
function. (Nikolai Pavlov)
Solution: Remove the partial when overwriting with a function.
diff --git a/src/eval.c b/src/eval.c
index 4537562..db6ef9d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -23455,7 +23455,8 @@
else
arg = fudi.fd_newkey;
if (arg != NULL && (fudi.fd_di == NULL
- || fudi.fd_di->di_tv.v_type != VAR_FUNC))
+ || (fudi.fd_di->di_tv.v_type != VAR_FUNC
+ && fudi.fd_di->di_tv.v_type != VAR_PARTIAL)))
{
if (*arg == K_SPECIAL)
j = 3;
diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim
index 75cc492..1fe67ea 100644
--- a/src/testdir/test_partial.vim
+++ b/src/testdir/test_partial.vim
@@ -193,3 +193,16 @@
call assert_true(v:false, v:exception)
endtry
endfunc
+
+func Test_redefine_dict_func()
+ let d = {}
+ function d.test4()
+ endfunction
+ let d.test4 = d.test4
+ try
+ function! d.test4(name)
+ endfunction
+ catch
+ call assert_true(v:errmsg, v:exception)
+ endtry
+endfunc
diff --git a/src/version.c b/src/version.c
index b90a0d0..dd9b5c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1645,
+/**/
1644,
/**/
1643,
