[5765] * Texinfo/Convert/Plaintext.pm (converter_initialize): propagate

[Patrice Dumas]

Revision: 5765
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5765
Author:   pertusus
Date:     2014-08-21 09:40:02 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
        * Texinfo/Convert/Plaintext.pm (converter_initialize): propagate
        FILLCOLUMN.  Report from Mahlon Smith.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Plaintext.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-08-20 17:18:39 UTC (rev 5764)
+++ trunk/ChangeLog     2014-08-21 09:40:02 UTC (rev 5765)
@@ -1,3 +1,8 @@
+2014-08-21  Karl Berry  <address@hidden>
+
+       * Texinfo/Convert/Plaintext.pm (converter_initialize): propagate
+       FILLCOLUMN.  Report from Mahlon Smith.
+
 2014-08-20  Gavin Smith  <address@hidden>
 
        * info/session.c (info_menu_item): Check for case when there are no

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2014-08-20 17:18:39 UTC (rev 
5764)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2014-08-21 09:40:02 UTC (rev 
5765)
@@ -387,15 +387,6 @@
       $self->{'style_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
     }
   }
-  # some caching to avoid calling get_conf
-  if ($self->get_conf('OUTPUT_PERL_ENCODING')) {
-    $self->{'output_perl_encoding'} = $self->get_conf('OUTPUT_PERL_ENCODING');
-  } else {
-    $self->{'output_perl_encoding'} = '';
-  }
-  $self->{'enable_encoding'} = $self->get_conf('ENABLE_ENCODING');
-  $self->{'output_encoding_name'} = $self->get_conf('OUTPUT_ENCODING_NAME');
-  $self->{'debug'} = $self->get_conf('DEBUG');
   $self->{'convert_text_options'} 
       = {Texinfo::Common::_convert_text_options($self)};
   if (defined($self->get_conf('OPEN_QUOTE_SYMBOL'))) {
@@ -410,6 +401,19 @@
        = $self->get_conf('CLOSE_QUOTE_SYMBOL');
     }
   }
+  if ($self->get_conf('FILLCOLUMN')) {
+    $self->{'fillcolumn'} = $self->get_conf('FILLCOLUMN');
+    # else it's already set via the defaults
+  }
+  # some caching to avoid calling get_conf
+  if ($self->get_conf('OUTPUT_PERL_ENCODING')) {
+    $self->{'output_perl_encoding'} = $self->get_conf('OUTPUT_PERL_ENCODING');
+  } else {
+    $self->{'output_perl_encoding'} = '';
+  }
+  $self->{'enable_encoding'} = $self->get_conf('ENABLE_ENCODING');
+  $self->{'output_encoding_name'} = $self->get_conf('OUTPUT_ENCODING_NAME');
+  $self->{'debug'} = $self->get_conf('DEBUG');
 
   return $self;
 }