To: vim_dev@googlegroups.com Subject: Patch 8.2.4246 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4246 Problem: One error message not in errors.h. (Antonio Colombo) Solution: Move the message and rename. Files: src/errors.h, src/if_perl.xs *** ../vim-8.2.4245/src/errors.h 2022-01-28 15:23:55.316653658 +0000 --- src/errors.h 2022-01-28 20:56:19.871303940 +0000 *************** *** 747,753 **** 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 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[] --- 747,756 ---- 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?")); ! #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[] *** ../vim-8.2.4245/src/if_perl.xs 2022-01-01 14:19:44.044353848 +0000 --- src/if_perl.xs 2022-01-28 20:56:51.058815898 +0000 *************** *** 1030,1036 **** #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" --- 1030,1035 ---- *************** *** 1084,1090 **** safe = perl_get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) ! emsg(_(e_perlsandbox)); else # endif { --- 1083,1089 ---- safe = perl_get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) ! emsg(_(e_perl_evaluation_forbidden_in_sandbox_without_safe_module)); else # endif { *************** *** 1361,1367 **** safe = get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) ! emsg(_(e_perlsandbox)); else # endif { --- 1360,1366 ---- safe = get_sv("VIM::safe", FALSE); # ifndef MAKE_TEST /* avoid a warning for unreachable code */ if (safe == NULL || !SvTRUE(safe)) ! emsg(_(e_perl_evaluation_forbidden_in_sandbox_without_safe_module)); else # endif { *** ../vim-8.2.4245/src/version.c 2022-01-28 20:47:44.107610955 +0000 --- src/version.c 2022-01-28 20:55:43.023881940 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4246, /**/ -- ./configure Checking whether build environment is sane ... build environment is grinning and holding a spatula. Guess not. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///