summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-04-27 20:15:55 +0000
committerBram Moolenaar <Bram@vim.org>2007-04-27 20:15:55 +0000
commit3d43a6658c6b2d44aebde338c09e2c153bad5843 (patch)
tree05c0e2b2c41cb1e222d1e4220d5058474fc5db9a
parentbbe8c3f735afa448d0fb9d84e67ffcd2ab11009d (diff)
downloadvim-git-3d43a6658c6b2d44aebde338c09e2c153bad5843.tar.gz
updated for version 7.0-234v7.0.234
-rw-r--r--src/eval.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
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
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 234,
+/**/
233,
/**/
232,