From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 27 Apr 2007 20:15:55 +0000 (+0000)
Subject: updated for version 7.0-234
X-Git-Tag: v7.0.234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d43a6658c6b2d44aebde338c09e2c153bad5843;p=vim

updated for version 7.0-234
---

diff --git a/src/eval.c b/src/eval.c
index 7a5ca1d60..cfb347616 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9078,6 +9078,12 @@ f_feedkeys(argvars, rettv)
     int		typed = FALSE;
     char_u	*keys_esc;
 
+    /* This is not allowed in the sandbox.  If the commands would still be
+     * executed in the sandbox it would be OK, but it probably happens later,
+     * when "sandbox" is no longer set. */
+    if (check_secure())
+	return;
+
     rettv->vval.v_number = 0;
     keys = get_tv_string(&argvars[0]);
     if (*keys != NUL)
diff --git a/src/version.c b/src/version.c
index 7f7e75f37..7fe531d9b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    234,
 /**/
     233,
 /**/