[no subject]

[Gavin D. Smith]

branch: release/7.0
commit 40b1ead58688461a1a8ba7f8944b0e6d99456c4a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Nov 8 17:36:43 2022 +0000

    * tp/texi2any.pl: Call _encode_message on messages passed to
    "die" to avoid "Wide character in die" warning.  Report from
    Werner.
---
 ChangeLog      |  6 ++++++
 tp/texi2any.pl | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d6dfd7dc2..4028095489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-08  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/texi2any.pl: Call _encode_message on messages passed to
+       "die" to avoid "Wide character in die" warning.  Report from
+       Werner.
+
 2022-11-08  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index f1573241fa..804d0ba6ff 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1200,8 +1200,9 @@ if (defined ($formats_table{$format}->{'init_file'})) {
 
 if ($call_texi2dvi) {
   if (defined(get_conf('OUTFILE')) and @ARGV > 1) {
-    die sprintf(__('%s: when generating %s, only one input FILE may be 
specified with -o'."\n"),
-                $real_command_name, format_name($format));
+    die _encode_message(
+      sprintf(__('%s: when generating %s, only one input FILE may be specified 
with -o'."\n"),
+                $real_command_name, format_name($format)));
   }
 } elsif($Xopt_arg_nr) {
   document_warn(__('--Xopt option without printed output')); 
@@ -1253,7 +1254,7 @@ if 
(defined($formats_table{$converted_format}->{'module'})) {
   eval "require $module";
   my $error = $@;
   if ($error ne '') {
-    die sprintf(__("error loading %s: %s"), $module, $error);
+    die _encode_message(sprintf(__("error loading %s: %s"), $module, $error));
   };
   eval "$module->import;";
 
@@ -1324,13 +1325,13 @@ if (get_conf('SHOW_BUILTIN_CSS_RULES')) {
 }
 
 # Main processing, process all the files given on the command line
-
 # Note that the input file names are binary strings and are not decoded
 my @input_files = @ARGV;
 # use STDIN if not a tty, like makeinfo does
 @input_files = ('-') if (!scalar(@input_files) and !-t STDIN);
-die sprintf(__("%s: missing file argument.\n"), $real_command_name) 
-   .sprintf(__("Try `%s --help' for more information.\n"), $real_command_name)
+die _encode_message(
+    sprintf(__("%s: missing file argument.\n"), $real_command_name) 
+   .sprintf(__("Try `%s --help' for more information.\n"), $real_command_name))
      unless (scalar(@input_files) >= 1);
 
 my $file_number = -1;