]> granicus.if.org Git - vim/commitdiff
updated for version 7.0-167 v7.0.167
authorBram Moolenaar <Bram@vim.org>
Tue, 21 Nov 2006 18:36:05 +0000 (18:36 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 21 Nov 2006 18:36:05 +0000 (18:36 +0000)
src/eval.c
src/version.c

index f0d38df5a5aad66916e49a495d705a7013447d76..e54d50080fa9a808c5714980d44fae9add9ca42a 100644 (file)
@@ -18539,12 +18539,14 @@ ex_function(eap)
 
     if (!eap->skip)
     {
-       /* Check the name of the function. */
+       /* Check the name of the function.  Unless it's a dictionary function
+        * (that we are overwriting). */
        if (name != NULL)
            arg = name;
        else
            arg = fudi.fd_newkey;
-       if (arg != NULL)
+       if (arg != NULL && (fudi.fd_di == NULL
+                                    || fudi.fd_di->di_tv.v_type != VAR_FUNC))
        {
            if (*arg == K_SPECIAL)
                j = 3;
index f0bb45ae0d0170586ccdd06c708f9f2cce6cddf9..550137eb0bee5cf78c0200a7662d93d03767db9d 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    167,
 /**/
     166,
 /**/