branch release/7.0 updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): correctly use _leading_spaces_arg return in case there is no space after @end command line and something else on the line.

[Gavin D. Smith]

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

gavin pushed a commit to branch release/7.0
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.0 by this push:
     new 603371ac0e * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): correctly 
use _leading_spaces_arg return in case there is no space after @end command 
line and something else on the line.
603371ac0e is described below

commit 603371ac0efe403326e93e955a17f0fca8725550
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 28 18:08:32 2022 +0000

    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): correctly use
    _leading_spaces_arg return in case there is no space after @end
    command line and something else on the line.
---
 ChangeLog                           | 6 ++++++
 tp/Texinfo/Convert/TexinfoMarkup.pm | 9 +++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 130937f7cd..10e981dc7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-27  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): correctly use
+       _leading_spaces_arg return in case there is no space after @end
+       command line and something else on the line.
+
 2022-11-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (command_text, _convert_xref_commands)
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 87232550df..1628e029f1 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1221,13 +1221,14 @@ sub _convert($$;$)
             and $element->{'contents'}->[-1]->{'cmdname'} eq 'end') {
           $end_command = $element->{'contents'}->[-1];
         }
-        my $end_command_space = _leading_spaces_arg($end_command);
-        if (scalar(@$end_command_space)) {
-          $end_command_space->[0] = 'endspaces';
+        my @end_command_spaces;
+        push @end_command_spaces, _leading_spaces_arg($end_command);
+        if (scalar(@end_command_spaces)) {
+          $end_command_spaces[0]->[0] = 'endspaces';
         }
         $result .= $self->txi_markup_open_element($element->{'cmdname'},
                                    [@$attribute, _leading_spaces_arg($element),
-                                    $end_command_space])
+                                    @end_command_spaces])
                    .${prepended_elements};
         if ($element->{'args'}) {
           my $variadic_element = undef;