From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 20 Feb 2013 14:19:43 +0000 (+0100)
Subject: updated for version 7.3.824
X-Git-Tag: v7.3.824
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2142e5d85112f37e68374c81612d6277c6aaaf0b;p=vim

updated for version 7.3.824
Problem:    Can redefine builtin functions.  (ZyX)
Solution:   Disallow adding a function to g:.
---

diff --git a/src/eval.c b/src/eval.c
index 106f1c57e..bc41805e9 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21164,6 +21164,9 @@ ex_function(eap)
 	    if (arg[j] != NUL)
 		emsg_funcname((char *)e_invarg2, arg);
 	}
+	/* Disallow using the g: dict. */
+	if (fudi.fd_dict != NULL && fudi.fd_dict->dv_scope == VAR_DEF_SCOPE)
+	    EMSG(_("E862: Cannot use g: here"));
     }
 
     /*
diff --git a/src/version.c b/src/version.c
index ca9b00666..fff1f7a6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    824,
 /**/
     823,
 /**/