integrate cfgperl contents into mainline

[p5sagit/p5-mst-13.2.git] / lib / utf8_heavy.pl

diff --git a/lib/utf8_heavy.pl b/lib/utf8_heavy.pl
index 71cbb17..8649e9e 100644 (file)
--- a/lib/utf8_heavy.pl
+++ b/lib/utf8_heavy.pl
@@ -38,7 +38,7 @@ sub SWASHNEW {
     if ($list) {
        my @tmp = split(/^/m, $list);
        my %seen;
-       local $^W = 0;
+       no warnings;
        $extras = join '', grep /^[^0-9a-fA-F]/, @tmp;
        $list = join '',
            sort { hex $a <=> hex $b }
@@ -123,8 +123,7 @@ sub SWASHGET {
 #              print "$min $max $val\n";
                if ($none) {
                    if ($min < $start) {
-                       $val += $start - $min;
-                       $val = $none if $val > $none;
+                       $val += $start - $min if $val < $none;
                        $min = $start;
                    }
                    for ($key = $min; $key <= $max; $key++) {