catch up -currentudb-merge

1 files changed, 5 insertions, 1 deletions

diff --git a/fml/lib/Mail/Message/MH.pm b/fml/lib/Mail/Message/MH.pm
index efd5ab4b..ba28b836 100644
--- a/fml/lib/Mail/Message/MH.pm
+++ b/fml/lib/Mail/Message/MH.pm
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
 #
-# $FML: MH.pm,v 1.12 2003/01/11 15:16:35 fukachan Exp $
+# $FML: MH.pm,v 1.14 2003/06/06 10:26:15 tmu Exp $
 #
 
 package Mail::Message::MH;
@@ -78,15 +78,19 @@ sub expand
     }
     elsif ($str =~ /^(\d+)\-(\d+)$/) {
         my ($first, $last) = ($1, $2);
+	$first = $min if($first < $min);
+	$last  = $max if($last > $max);
         return _expand_range($first, $last);
     }
     elsif ($str =~ /^(first)\-(\d+)$/) {
         my ($first, $last) = ($1, $2);
+	$last  = $max if($last > $max);
         return _expand_range($min, $last);
     }
     elsif ($str =~ /^(\d+)\-(last)$/) {
 	unless (defined $max) { return undef;}
         my ($first, $last) = ($1, $2);
+	$first = $min if($first < $min);
         return _expand_range($first, $max);
     }
     elsif ($str eq 'first') {