branch master updated: * tp/Texinfo/ParserNonXS.pm (import): never load the abort_empty_line XS override as the function is not up to date with the changes needed for source marks. Do not load the merge_text override either, as it uses the abort_empty_line XS override.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 4da87702ca * tp/Texinfo/ParserNonXS.pm (import): never load the 
abort_empty_line XS override as the function is not up to date with the changes 
needed for source marks.  Do not load the merge_text override either, as it 
uses the abort_empty_line XS override.
4da87702ca is described below

commit 4da87702ca4c8793165313db7d7921d0393cb090
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Feb 4 22:12:05 2023 +0100

    * tp/Texinfo/ParserNonXS.pm (import): never load the abort_empty_line
    XS override as the function is not up to date with the changes needed
    for source marks.  Do not load the merge_text override either, as it
    uses the abort_empty_line XS override.
---
 ChangeLog                 |  7 +++++++
 tp/Texinfo/ParserNonXS.pm | 10 ++++++----
 tp/Texinfo/XS/misc.c      |  3 +++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da682b15d6..e6bc4c61c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (import): never load the abort_empty_line
+       XS override as the function is not up to date with the changes needed
+       for source marks.  Do not load the merge_text override either, as it
+       uses the abort_empty_line XS override.
+
 2023-02-04  Gavin Smith <gavinsmith0123@gmail.com>
 
        Eliminate duplicate warning messages
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e7cb37379f..32c9310804 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -96,10 +96,12 @@ use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
 our $module_loaded = 0;
 sub import {
   if (!$module_loaded) {
-    Texinfo::XSLoader::override ("Texinfo::Parser::_merge_text",
-      "Texinfo::MiscXS::merge_text");
-    Texinfo::XSLoader::override ("Texinfo::Parser::_abort_empty_line",
-      "Texinfo::MiscXS::abort_empty_line");
+    # not loaded because it uses the abort_empty_line XS override
+    #Texinfo::XSLoader::override ("Texinfo::Parser::_merge_text",
+    #  "Texinfo::MiscXS::merge_text");
+    # TODO not up tp date with the changes for source marks
+    #Texinfo::XSLoader::override ("Texinfo::Parser::_abort_empty_line",
+    #  "Texinfo::MiscXS::abort_empty_line");
     Texinfo::XSLoader::override ("Texinfo::Parser::_parse_texi_regex",
       "Texinfo::MiscXS::parse_texi_regex");
     $module_loaded = 1;
diff --git a/tp/Texinfo/XS/misc.c b/tp/Texinfo/XS/misc.c
index 30d1431d94..e02fcfa458 100644
--- a/tp/Texinfo/XS/misc.c
+++ b/tp/Texinfo/XS/misc.c
@@ -45,6 +45,8 @@
 
 const char *whitespace_chars = " \t\f\v\r\n";
 
+/* currently not used as it is not up to date with the changes
+   for source marks */
 int
 xs_abort_empty_line (HV *self, HV *current, SV *additional_spaces_in)
 {
@@ -218,6 +220,7 @@ delete_type:
   return 1;
 }
 
+/* currently not used as it calls xs_abort_empty_line */
 HV *
 xs_merge_text (HV *self, HV *current, SV *text_in)
 {