make wfits handle multi HISTORY

IO/FITS/FITS.pm

@@ -1925,7 +1925,9 @@ sub PDL::wfits {
 	  }
 	  # Make sure that the HISTORY lines all come at the end
 	  my @hindex = $afhdr->index('HISTORY');
-	  $afhdr->insert(-1-$_, $afhdr->remove($hindex[-1-$_])) for 0..$#hindex;
+	  my @hitems = map $afhdr->item($_), @hindex;
+	  $afhdr->remove($_) for reverse @hindex; # remove from back as from front disrupts numbering
+	  $afhdr->insert(-1, $_) for @hitems;
 	  # Make sure the last card is an END
 	  $afhdr->insert(scalar($afhdr->cards),
 		       Astro::FITS::Header::Item->new(Keyword=>'END'));

IO/FITS/t/fits.t

@@ -348,25 +348,20 @@ ok all(approx $m51, $m51_2), 'read back written-out compressed FITS file' or dia
 }
 }
 
-#multi-line HISTORY header writing
-{   my $f_out;
-    my $hstr = join("\n",'A'..'G');
-
-    $f_out = 'long_history.fits';
+{
+    my $hstr = join("\n",'A'..'G',''); # must end in newline
+    (undef, my $f_out) = File::Temp::tempfile( 'delmeXXXXX', SUFFIX => '.fits', %tmp_opts );
     my $x = xvals(10);
     $x->hdr->{'HISTORY'} = $hstr;
     $x->wfits($f_out);
     my $xr = rfits($f_out);
     is($xr->hdr->{'HISTORY'}, $hstr, 'multi-line HISTORY correct with fresh header');
     unlink($f_out) or die "couldn't delete $f_out";
-
-    $f_out = 'm51_longhist.fits';
     my $m51 = rfits('t/m51.fits.fz');
     $m51->hdr->{HISTORY} = $hstr;
     $m51->wfits($f_out);
     my $m51r = rfits($f_out);
     is($m51r->hdr->{'HISTORY'}, $hstr, 'multi-line HISTORY correct with pre-existing header');
-    unlink($f_out) or die "couldn't delete $f_out";
 }
 
 done_testing();