File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -747,7 +747,10 @@ EXTERN char e_didnt_get_block_nr_one[]
747
747
INIT (= N_ ("E298: Didn't get block nr 1?" ));
748
748
EXTERN char e_didnt_get_block_nr_two []
749
749
INIT (= N_ ("E298: Didn't get block nr 2?" ));
750
- // E299 unused
750
+ #ifdef FEAT_PERL
751
+ EXTERN char e_perl_evaluation_forbidden_in_sandbox_without_safe_module []
752
+ INIT (= N_ ("E299: Perl evaluation forbidden in sandbox without the Safe module" ));
753
+ #endif
751
754
EXTERN char e_swap_file_already_exists_symlink_attack []
752
755
INIT (= N_ ("E300: Swap file already exists (symlink attack?)" ));
753
756
EXTERN char e_oops_lost_the_swap_file []
Original file line number Diff line number Diff line change @@ -1030,7 +1030,6 @@ VIM_init(void)
1030
1030
#ifdef DYNAMIC_PERL
1031
1031
static char * e_noperl = N_ ("Sorry, this command is disabled: the Perl library could not be loaded." );
1032
1032
#endif
1033
- static char * e_perlsandbox = N_ ("E299: Perl evaluation forbidden in sandbox without the Safe module" );
1034
1033
1035
1034
/*
1036
1035
* ":perl"
@@ -1084,7 +1083,7 @@ ex_perl(exarg_T *eap)
1084
1083
safe = perl_get_sv ("VIM::safe" , FALSE);
1085
1084
# ifndef MAKE_TEST /* avoid a warning for unreachable code */
1086
1085
if (safe == NULL || !SvTRUE (safe ))
1087
- emsg (_ (e_perlsandbox ));
1086
+ emsg (_ (e_perl_evaluation_forbidden_in_sandbox_without_safe_module ));
1088
1087
else
1089
1088
# endif
1090
1089
{
@@ -1361,7 +1360,7 @@ do_perleval(char_u *str, typval_T *rettv)
1361
1360
safe = get_sv ("VIM::safe" , FALSE);
1362
1361
# ifndef MAKE_TEST /* avoid a warning for unreachable code */
1363
1362
if (safe == NULL || !SvTRUE (safe ))
1364
- emsg (_ (e_perlsandbox ));
1363
+ emsg (_ (e_perl_evaluation_forbidden_in_sandbox_without_safe_module ));
1365
1364
else
1366
1365
# endif
1367
1366
{
Original file line number Diff line number Diff line change @@ -750,6 +750,8 @@ static char *(features[]) =
750
750
751
751
static int included_patches [] =
752
752
{ /* Add new patch number below this line */
753
+ /**/
754
+ 4246 ,
753
755
/**/
754
756
4245 ,
755
757
/**/
You can’t perform that action at this time.
0 commit comments