texinfo/texi2html ChangeLog formats/plaintext.init

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/06/21 21:33:25

Modified files:
        texi2html      : ChangeLog 
        texi2html/formats: plaintext.init 

Log message:
                * formats/plaintext.init: when doing plaintext or info with 
                --headers, don't set the output to be STDOUT if already set and 
is
                not a directory. Report from Karl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/ChangeLog?cvsroot=texinfo&r1=1.499&r2=1.500
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/plaintext.init?cvsroot=texinfo&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/ChangeLog,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -b -r1.499 -r1.500
--- ChangeLog   21 Jun 2010 07:03:12 -0000      1.499
+++ ChangeLog   21 Jun 2010 21:33:21 -0000      1.500
@@ -1,5 +1,11 @@
 2010-06-21   Patrice Dumas  <address@hidden>
 
+       * formats/plaintext.init: when doing plaintext or info with 
+       --headers, don't set the output to be STDOUT if already set and is
+       not a directory. Report from Karl.
+
+2010-06-21   Patrice Dumas  <address@hidden>
+
        * texi2html.pl: in htmlxref.cnf, a comment is now ^\s*# instead
        of # followed by a space anywhere on the line. Report from Karl.
 

Index: formats/plaintext.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/formats/plaintext.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- formats/plaintext.init      20 Mar 2010 14:06:11 -0000      1.6
+++ formats/plaintext.init      21 Jun 2010 21:33:23 -0000      1.7
@@ -29,7 +29,7 @@
 info_default_load();
 
 $SHOW_MENU = 0;
-$OUT = '-';
+$OUT = '-' unless(defined($OUT) and $OUT !~ m:/$:);
 $HEADERS = 0;
 @T2H_FORMAT_EXPAND = ('plaintext');