updated for version 7.0-234

diff --git a/src/eval.c b/src/eval.c
index 7a5ca1d6005634d8edf8c9c3fc50f857b5535dfc..cfb347616cd5b6ef09c194ebf38e797108994887 100644 (file)
--- 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 7f7e75f375591ad574ac8c099e21a1a2da6a8533..7fe531d9b9f54be21000d106314b5dd58b0d8e9e 100644 (file)
--- 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,
 /**/