diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-28 21:00:51 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-28 21:00:51 +0000 |
| commit | e96eea7b6a56bc7c12e062e90b2e816ff61e705c (patch) | |
| tree | bb55f176979904ea0a963e60470933123e61ee15 | |
| parent | 652dee448618589de5528a9e9a36995803f5557a (diff) | |
patch 8.2.4246: one error message not in errors.hv8.2.4246
Problem: One error message not in errors.h. (Antonio Colombo)
Solution: Move the message and rename.
| -rw-r--r-- | src/errors.h | 5 | ||||
| -rw-r--r-- | src/if_perl.xs | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/errors.h b/src/errors.h index da45df2100..7e6d0dbd18 100644 --- a/src/errors.h +++ b/src/errors.h @@ -747,7 +747,10 @@ EXTERN char e_didnt_get_block_nr_one[] INIT(= N_("E298: Didn't get block nr 1?")); EXTERN char e_didnt_get_block_nr_two[] INIT(= N_("E298: Didn't get block nr 2?")); -// E299 unused +#ifdef FEAT_PERL +EXTERN char e_perl_evaluation_forbidden_in_sandbox_without_safe_module[] + INIT(= N_("E299: Perl evaluation forbidden in sandbox without the Safe module")); +#endif EXTERN char e_swap_file_already_exists_symlink_attack[] INIT(= N_("E300: Swap file already exists (symlink attack?)")); EXTERN char e_oops_lost_the_swap_file[] diff --git a/src/if_perl.xs b/src/if_perl.xs index 37b9cb292e..c7177700ff 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -1030,7 +1030,6 @@ VIM_init(void) #ifdef DYNAMIC_PERL static char *e_noperl = N_("Sorry, this command is disabled: the Perl library could not be loaded."); #endif -static char *e_perlsandbox = N_("E299: Perl evaluation forbidden in sandbox without the Safe module"); /* * ":perl" @@ -1084,7 +1083,7 @@ ex_perl(exarg_T *eap) safe = perl_get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) - emsg(_(e_perlsandbox)); + emsg(_(e_perl_evaluation_forbidden_in_sandbox_without_safe_module)); else # endif { @@ -1361,7 +1360,7 @@ do_perleval(char_u *str, typval_T *rettv) safe = get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) - emsg(_(e_perlsandbox)); + emsg(_(e_perl_evaluation_forbidden_in_sandbox_without_safe_module)); else # endif { diff --git a/src/version.c b/src/version.c index 8275e8f2ae..b0d48d50a6 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4246, +/**/ 4245, /**/ 4244, |