[7178] don't overwrite extra values

[gavinsmith0123]

Revision: 7178
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7178
Author:   gavin
Date:     2016-05-22 18:39:00 +0000 (Sun, 22 May 2016)
Log Message:
-----------
don't overwrite extra values

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/xtable/definfoenclose_on_table_line.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-22 18:09:41 UTC (rev 7177)
+++ trunk/ChangeLog     2016-05-22 18:39:00 UTC (rev 7178)
@@ -1,5 +1,10 @@
 2016-05-22  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <@definfoenclose command>: 
+       Don't overwrite any 'extra' values, such as 'invalid_nesting'.
+
+2016-05-22  Gavin Smith  <address@hidden>
+
        * NEWS: Update with news since 6.1 release.
 
 2016-05-22  Ingo Feinerer  <address@hidden>  (tiny change)

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-05-22 18:09:41 UTC (rev 7177)
+++ trunk/tp/Texinfo/Parser.pm  2016-05-22 18:39:00 UTC (rev 7178)
@@ -4930,9 +4930,10 @@
           }
           if ($self->{'definfoenclose'}->{$command}) {
             $current->{'type'} = 'definfoenclose_command';
-            $current->{'extra'} = { 
-                 'begin' => $self->{'definfoenclose'}->{$command}->[0], 
-                 'end' => $self->{'definfoenclose'}->{$command}->[1] };
+            $current->{'extra'}->{'begin'} =
+                 $self->{'definfoenclose'}->{$command}->[0]; 
+            $current->{'extra'}->{'end'} =
+                 $self->{'definfoenclose'}->{$command}->[1]; 
           }
         } elsif (exists ($no_brace_commands{$command})) {
           push @{$current->{'contents'}},

Modified: trunk/tp/t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
--- trunk/tp/t/results/xtable/definfoenclose_on_table_line.pl   2016-05-22 
18:09:41 UTC (rev 7177)
+++ trunk/tp/t/results/xtable/definfoenclose_on_table_line.pl   2016-05-22 
18:39:00 UTC (rev 7178)
@@ -73,7 +73,8 @@
               'contents' => [],
               'extra' => {
                 'begin' => ':',
-                'end' => ':'
+                'end' => ':',
+                'invalid_nesting' => 1
               },
               'parent' => {},
               'type' => 'definfoenclose_command'