[7852] verbatiminclude save INPUT_PERL_ENCODING

[gavinsmith0123]

Revision: 7852
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7852
Author:   gavin
Date:     2017-06-25 11:27:01 -0400 (Sun, 25 Jun 2017)
Log Message:
-----------
verbatiminclude save INPUT_PERL_ENCODING

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Parser.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-06-25 14:32:12 UTC (rev 7851)
+++ trunk/ChangeLog     2017-06-25 15:27:01 UTC (rev 7852)
@@ -1,5 +1,13 @@
 2017-06-25  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_end_line) <@verbatiminclude>: Save 
+       value of 'input_perl_encoding' on the element.
+       * tp/Texinfo/Common.pm (expand_verbatiminclude): Use the
+       saved value of 'input_perl_encoding' instead of looking at
+       'INPUT_PERL_ENCODING' conf value.
+
+2017-06-25  Gavin Smith  <address@hidden>
+
        * info/nodes.c (info_get_node_with_defaults): Remove code that
        fell back to a man page.  This got in the way of the code in
        info_get_info_help_node that fell back to info-stnd.info if 

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2017-06-25 14:32:12 UTC (rev 7851)
+++ trunk/tp/Texinfo/Common.pm  2017-06-25 15:27:01 UTC (rev 7852)
@@ -1142,9 +1142,10 @@
                             $current->{'line_nr'});
       }
     } else {
-      if ($self and defined($self->get_conf('INPUT_PERL_ENCODING'))) {
-        binmode(VERBINCLUDE, ":encoding(".
-                            $self->get_conf('INPUT_PERL_ENCODING').")");
+      if (defined $current->{'extra'}->{'input_perl_encoding'}) {
+        binmode(VERBINCLUDE, ":encoding("
+                             . $current->{'extra'}->{'input_perl_encoding'}
+                             . ")");
       }
       $verbatiminclude = { 'cmdname' => 'verbatim',
                            'parent' => $current->{'parent'},

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-06-25 14:32:12 UTC (rev 7851)
+++ trunk/tp/Texinfo/Parser.pm  2017-06-25 15:27:01 UTC (rev 7852)
@@ -3178,6 +3178,10 @@
                               $self->__("address@hidden: could not find %s"),
                               $command, $text);
           }
+        } elsif ($command eq 'verbatiminclude') {
+          $current->{'extra'}->{'input_perl_encoding'}
+                                          = $self->{'INPUT_PERL_ENCODING'}
+            if defined $self->{'INPUT_PERL_ENCODING'};
         } elsif ($command eq 'documentencoding') {
           my ($texinfo_encoding, $perl_encoding, $input_encoding)
             = Texinfo::Encoding::encoding_alias($text);