[7875] parsetexi fix IGNORE_BEFORE_SETFILENAME

[gavinsmith0123]

Revision: 7875
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7875
Author:   gavin
Date:     2017-06-28 18:09:55 -0400 (Wed, 28 Jun 2017)
Log Message:
-----------
parsetexi fix IGNORE_BEFORE_SETFILENAME

Modified Paths:
--------------
    trunk/tp/parsetexi/Parsetexi.pm
    trunk/tp/parsetexi/handle_commands.c

Modified: trunk/tp/parsetexi/Parsetexi.pm
===================================================================
--- trunk/tp/parsetexi/Parsetexi.pm     2017-06-28 21:49:23 UTC (rev 7874)
+++ trunk/tp/parsetexi/Parsetexi.pm     2017-06-28 22:09:55 UTC (rev 7875)
@@ -314,7 +314,8 @@
   # The non-XS Perl code checks $self->{'extra'}->{'setfilename'}, which
   # would be set in _register_global_command.
   if ($self->{'IGNORE_BEFORE_SETFILENAME'} and $text_root
-      and $self->{'extra'}->{'setfilename'}) {
+      and $self->{'extra'}->{'setfilename'}
+      and $self->{'extra'}->{'setfilename'}->{'parent'} eq $text_root) {
     my $before_setfilename = {'type' => 'preamble_before_setfilename',
       'parent' => $text_root,
       'contents' => []};

Modified: trunk/tp/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/parsetexi/handle_commands.c        2017-06-28 21:49:23 UTC (rev 
7874)
+++ trunk/tp/parsetexi/handle_commands.c        2017-06-28 22:09:55 UTC (rev 
7875)
@@ -150,7 +150,7 @@
           extern int input_number;
         case CM_setfilename:
           /* Check if we are inside an @include, and if so, do nothing. */
-          if (input_number > 1)
+          if (top_file_index () > 0)
             break;
           where = &global_info.setfilename;
           break;