texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Wed, 25 Dec 2024 16:12:14 -0500 (EST)

branch: master
commit 3ae12003932ebfbac86aa4d26b5b123ce7b0d6b1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Dec 25 20:21:26 2024 +0100

    * tp/Texinfo/XS/texi2any.c (main): set program_file to be "texi2any"
    if TEST is set.
    
    * tp/Texinfo/XS/texi2any.c (main): if FORMAT_MENU is not set a all,
    consider that menus are to be checked.
---
 ChangeLog                |  8 ++++++++
 tp/Texinfo/XS/texi2any.c | 11 +++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f21e79f1b..02ffe4ffb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-12-25  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/texi2any.c (main): set program_file to be "texi2any"
+       if TEST is set.
+
+       * tp/Texinfo/XS/texi2any.c (main): if FORMAT_MENU is not set a all,
+       consider that menus are to be checked.
+
 2024-12-25  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/texi2any.c (main): reset the format_specification to
diff --git a/tp/Texinfo/XS/texi2any.c b/tp/Texinfo/XS/texi2any.c
index 68c27234f5..53b8a6fc47 100644
--- a/tp/Texinfo/XS/texi2any.c
+++ b/tp/Texinfo/XS/texi2any.c
@@ -1697,6 +1697,9 @@ main (int argc, char *argv[], char *env[])
       add_option_value (&program_options, "PACKAGE_URL", 0,
                                      "https://www.gnu.org/software/texinfo/";);
       add_option_value (&program_options, "PROGRAM", 0, "texi2any");
+
+      free (program_file);
+      program_file = strdup ("texi2any");
     }
 
   init_file_format = GNUT_get_format_from_init_file ();
@@ -1884,9 +1887,9 @@ main (int argc, char *argv[], char *env[])
   free (conversion_format_menu_default);
 
   format_menu_option = GNUT_get_conf (format_menu_option_nr);
-  if (format_menu_option && (!format_menu_option->o.string
-                             || !strcmp (format_menu_option->o.string,
-                                         "menu")))
+  if (!format_menu_option || !format_menu_option->o.string
+                          || !strcmp (format_menu_option->o.string,
+                                         "menu"))
     do_menu = 1;
 
   initialize_options_list (&parser_options);
@@ -2016,7 +2019,7 @@ main (int argc, char *argv[], char *env[])
           memcpy (corrected + strlen (corrected) -strlen (".info"), ".texi",
                   strlen (".texi"));
           txi_config_document_warn ("input file %s; did you mean %s?",
-                         arg_basename, corrected);
+                                    arg_basename, corrected);
           free (corrected);
           free (arg_basename);
         }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]