branch master updated: Fix translation of messages with XS modules

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 1613b69b34 Fix translation of messages with XS modules
1613b69b34 is described below

commit 1613b69b341aa6b1b4ec66c2949b916345e50624
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Feb 22 19:20:34 2022 +0000

    Fix translation of messages with XS modules
    
    * tp/Texinfo/XSLoader.pm: require rather than use Texinfo::ModulePath
    to prevent initialization being done again, incorrectly.  This led
    to incorrect locale dirs being used due to
    $Texinfo::ModulePath::texinfo_uninstalled being reset.
---
 ChangeLog              | 9 +++++++++
 tp/Texinfo/XSLoader.pm | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 30095f681e..3a83167f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-02-22  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix translation of messages with XS modules
+
+       * tp/Texinfo/XSLoader.pm: require rather than use Texinfo::ModulePath
+       to prevent initialization being done again, incorrectly.  This led
+       to incorrect locale dirs being used due to
+       $Texinfo::ModulePath::texinfo_uninstalled being reset.
+
 2022-02-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/api.c (build_texinfo_tree): return
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 4654f09144..5bbecf4696 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -21,7 +21,7 @@ use warnings;
 
 use DynaLoader;
 
-use Texinfo::ModulePath;
+require Texinfo::ModulePath;
 
 our $TEXINFO_XS;