From f4b9cad720b9818321cbb2a7f68718cddefd3ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Mon, 21 Aug 2023 13:10:26 +0200 Subject: perl: fix display of non-ASCII chars after load of a script with Perl >= 5.38 (closes #1996) --- src/plugins/perl/weechat-perl.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/plugins/perl/weechat-perl.c') diff --git a/src/plugins/perl/weechat-perl.c b/src/plugins/perl/weechat-perl.c index 1759a4810..1796679d9 100644 --- a/src/plugins/perl/weechat-perl.c +++ b/src/plugins/perl/weechat-perl.c @@ -22,6 +22,7 @@ #undef _ +#include #include #include #include @@ -567,6 +568,10 @@ weechat_perl_load (const char *filename, const char *code) temp_script.interpreter = (PerlInterpreter *) perl_current_interpreter; perl_parse (perl_current_interpreter, weechat_perl_api_init, perl_args_count, perl_args, NULL); +#if PERL_REVISION >= 6 || (PERL_REVISION == 5 && PERL_VERSION >= 38) + /* restore the locale that could be changed by Perl >= 5.38 */ + Perl_setlocale (LC_CTYPE, ""); +#endif length = strlen (perl_weechat_code) + strlen (str_warning) + strlen (str_error) - 2 + 4 + strlen ((code) ? code : filename) + 4 + 1; perl_code = malloc (length); @@ -1290,6 +1295,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) perl_construct (perl_main); perl_parse (perl_main, weechat_perl_api_init, perl_args_count, perl_args, NULL); +#if PERL_REVISION >= 6 || (PERL_REVISION == 5 && PERL_VERSION >= 38) + /* restore the locale that could be changed by Perl >= 5.38 */ + Perl_setlocale (LC_CTYPE, ""); +#endif #endif /* MULTIPLICITY */ perl_data.config_file = &perl_config_file; -- cgit v1.2.3