diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | src/plugins/perl/weechat-perl.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index d310bb201..58fca80d9 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -47,6 +47,7 @@ Bug fixes:: * irc: add missing tags on multiline messages (issue #1987) * irc: fix redirection of command `/list` when the reply doesn't start with message 321 (start of /list) * irc: fix wrong time displayed for CTCP messages received from self nick (issue #2000) + * perl: fix display of non-ASCII chars after load of a script with Perl >= 5.38 (issue #1996) * relay: synchronize nick modes with IRC client upon connection (issue #1984) * script: fix cursor position after `/script list -i` or `/script list -il` * script: fix buffer used by command `/script list -i|-il|-o|-ol` 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 <locale.h> #include <EXTERN.h> #include <perl.h> #include <XSUB.h> @@ -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; |