changeset 27436:4c683d6c0a9d v8.2.4246

patch 8.2.4246: one error message not in errors.h Commit: https://github.com/vim/vim/commit/e96eea7b6a56bc7c12e062e90b2e816ff61e705c Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 28 21:00:51 2022 +0000 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.
author Bram Moolenaar <Bram@vim.org>
date Fri, 28 Jan 2022 22:15:03 +0100
parents 38c472afefd4
children 37dca3b3f63b
files src/errors.h src/if_perl.xs src/version.c
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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[]
--- 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
 	    {
--- 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,