summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-11-11 13:45:33 +0000
committerBram Moolenaar <Bram@vim.org>2009-11-11 13:45:33 +0000
commit954e8c54a09231c3baed92c9bba974b5fe6e5032 (patch)
tree70e08fc60f4cc2f94435c51f71d9659c04980e65
parentef94eec64431f053ac868f3c19d389057cf97772 (diff)
downloadvim-git-954e8c54a09231c3baed92c9bba974b5fe6e5032.tar.gz
updated for version 7.2-287v7.2.287
-rw-r--r--src/if_perl.xs3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 926adcef5..1ef0eb4aa 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -720,8 +720,9 @@ ex_perl(eap)
#ifdef HAVE_SANDBOX
if (sandbox)
{
+ safe = perl_get_sv( "VIM::safe", FALSE );
# ifndef MAKE_TEST /* avoid a warning for unreachable code */
- if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
+ if (safe == NULL || !SvTRUE(safe))
EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
else
# endif
diff --git a/src/version.c b/src/version.c
index 15ffd8e4d..61609c8c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 287,
+/**/
286,
/**/
285,