Skip to content

Commit e96eea7

Browse files
committed
patch 8.2.4246: one error message not in errors.h
Problem: One error message not in errors.h. (Antonio Colombo) Solution: Move the message and rename.
1 parent 652dee4 commit e96eea7

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/errors.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,10 @@ EXTERN char e_didnt_get_block_nr_one[]
747747
INIT(= N_("E298: Didn't get block nr 1?"));
748748
EXTERN char e_didnt_get_block_nr_two[]
749749
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
751754
EXTERN char e_swap_file_already_exists_symlink_attack[]
752755
INIT(= N_("E300: Swap file already exists (symlink attack?)"));
753756
EXTERN char e_oops_lost_the_swap_file[]

src/if_perl.xs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,6 @@ VIM_init(void)
10301030
#ifdef DYNAMIC_PERL
10311031
static char *e_noperl = N_("Sorry, this command is disabled: the Perl library could not be loaded.");
10321032
#endif
1033-
static char *e_perlsandbox = N_("E299: Perl evaluation forbidden in sandbox without the Safe module");
10341033

10351034
/*
10361035
* ":perl"
@@ -1084,7 +1083,7 @@ ex_perl(exarg_T *eap)
10841083
safe = perl_get_sv("VIM::safe", FALSE);
10851084
# ifndef MAKE_TEST /* avoid a warning for unreachable code */
10861085
if (safe == NULL || !SvTRUE(safe))
1087-
emsg(_(e_perlsandbox));
1086+
emsg(_(e_perl_evaluation_forbidden_in_sandbox_without_safe_module));
10881087
else
10891088
# endif
10901089
{
@@ -1361,7 +1360,7 @@ do_perleval(char_u *str, typval_T *rettv)
13611360
safe = get_sv("VIM::safe", FALSE);
13621361
# ifndef MAKE_TEST /* avoid a warning for unreachable code */
13631362
if (safe == NULL || !SvTRUE(safe))
1364-
emsg(_(e_perlsandbox));
1363+
emsg(_(e_perl_evaluation_forbidden_in_sandbox_without_safe_module));
13651364
else
13661365
# endif
13671366
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
4246,
753755
/**/
754756
4245,
755757
/**/

0 commit comments

Comments
 (0)