branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): add $current to new_line call to register source mark after @end of ignored cnditional.

[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 f1e5f019ed * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), 
tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line): add $current to 
new_line call to register source mark after @end of ignored cnditional.
f1e5f019ed is described below

commit f1e5f019ed8278447e60307e82abccc7063bad3a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 9 15:29:30 2023 +0100

    * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
    tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line):
    add $current to new_line call to register source mark after @end of
    ignored cnditional.
---
 ChangeLog                                         |  7 +++++++
 tp/Texinfo/ParserNonXS.pm                         |  2 +-
 tp/Texinfo/XS/parsetexi/parser.c                  |  2 +-
 tp/t/results/conditionals/nested_ifset_ifclear.pl | 10 ++++++++++
 tp/t/results/macro/ifset_in_macro.pl              |  6 ++++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed646d169b..0790ca174d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,13 @@
        block line element: only set 'columnfractions'.
        (end_line_starting_block): Check if 'columnfractions' has been set.
 
+2023-02-08  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+       tp/Texinfo/XS/parsetexi/parser.c (process_remaining_on_line):
+       add $current to new_line call to register source mark after @end of
+       ignored cnditional.
+
 2023-02-08  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_relocate_source_marks),
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 429e969167..2b7e1944b8 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4797,7 +4797,7 @@ sub _process_remaining_on_line($$$$)
       # Ignore until end of line
       # FIXME this is not the same as for other commands.  Change?
       if ($line !~ /\n/) {
-        ($line, $source_info) = _new_line($self);
+        ($line, $source_info) = _new_line($self, $current);
         print STDERR "IGNORE CLOSE line: $line" if ($self->{'DEBUG'});
       }
     }
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 15a0a45e87..4af79a1b38 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1486,7 +1486,7 @@ process_remaining_on_line (ELEMENT **current_inout, char 
**line_inout)
           /* Ignore until end of line */
           if (!strchr (line, '\n'))
             {
-              line = new_line (0);
+              line = new_line (current);
               debug ("IGNORE CLOSE line: %s", line);
             }
           destroy_element_and_children (popped);
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 45fa684b27..73d0953677 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -318,6 +318,11 @@ $result_trees{'nested_ifset_ifclear'} = {
               },
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
+            },
+            {
+              'counter' => 3,
+              'sourcemark_type' => 'macro_expansion',
+              'status' => 'end'
             }
           ]
         },
@@ -377,6 +382,11 @@ $result_trees{'nested_ifset_ifclear'} = {
               },
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
+            },
+            {
+              'counter' => 4,
+              'sourcemark_type' => 'macro_expansion',
+              'status' => 'end'
             }
           ]
         }
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index 5f431b7ff2..470a066106 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -99,6 +99,12 @@ $result_trees{'ifset_in_macro'} = {
               'position' => 1,
               'sourcemark_type' => 'macro_expansion',
               'status' => 'start'
+            },
+            {
+              'counter' => 1,
+              'position' => 1,
+              'sourcemark_type' => 'macro_expansion',
+              'status' => 'end'
             }
           ],
           'text' => '