[no subject]

[Patrice Dumas]

branch: master
commit 7e8657f2cc8f2fdec946103f555fcf3daf50c06e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat May 18 23:05:45 2024 +0200

    * tp/Texinfo/XS/parsetexi/api.c (reset_parser, parse_file): call
    reset_parser_except_conf in parse_file instead of reset_parser.
---
 ChangeLog                     |  5 +++++
 tp/Texinfo/XS/parsetexi/api.c | 10 ++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f432ca674f..b088d936e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-18  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/parsetexi/api.c (reset_parser, parse_file): call
+       reset_parser_except_conf in parse_file instead of reset_parser.
+
 2024-05-18  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (%parser_document_state_initialization):
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 3b256f8927..cb318a5f4e 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -45,13 +45,6 @@
 #include "conf.h"
 #include "api.h"
 
-/* When reset_parser_except_conf is called in parse_*, parse_texi will
-   be called afterwards.
-   When reset_parser_except_conf is called by reset_parser in parser
-   initialization, however, there will be a call to parse_* afterwards
-   leading to calling reset_parser_except_conf again without a call to
-   parse_texi inbetween.
- */
 void
 reset_parser_except_conf (void)
 {
@@ -92,7 +85,6 @@ reset_parser (int local_debug_output)
     fprintf (stderr,
           "!!!!!!!!!!!!!!!! RESETTING THE PARSER !!!!!!!!!!!!!!!!!!!!!\n");
 
-  reset_parser_except_conf ();
   wipe_values ();
   clear_parser_expanded_formats ();
   parser_clear_include_directories ();
@@ -122,6 +114,8 @@ parse_file (const char *filename, const char 
*input_file_name,
 
   int status;
 
+  reset_parser_except_conf ();
+
   parsed_document = new_document ();
   set_input_encoding ("utf-8");