texinfo/tp texi2any.pl

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/28 23:54:12

Modified files:
        tp             : texi2any.pl 

Log message:
        Simplify code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.170&r2=1.171

Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- texi2any.pl 28 Jan 2013 23:49:07 -0000      1.170
+++ texi2any.pl 28 Jan 2013 23:54:12 -0000      1.171
@@ -607,6 +607,7 @@
 {
   my $set_format = shift;
   my $previous_format = shift;
+  $previous_format = $format if (!defined($previous_format));
   my $do_not_override_command_line = shift;
 
   my $new_format;
@@ -620,11 +621,9 @@
     warn(sprintf(__("%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value 
`%s'.\n"), 
                  $real_command_name, $new_format));
     $new_format = $previous_format;
-    $new_format = $format if (!defined($new_format));
   } else {
     if ($format_from_command_line and $do_not_override_command_line) {
       $new_format = $previous_format;
-      $new_format = $format if (!defined($new_format));
     } else {
       if ($formats_table{$new_format}->{'texi2dvi_format'}) {
         $call_texi2dvi = 1;