X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FEncode%2Flib%2FEncode%2FJP%2FJIS.pm;h=a3c39d6b67fe8afbede1608b22d7b2b8c6920ca2;hb=64ffdd5e3070e2601e8355984407a490ea080833;hp=86878216f90641d77de744090209d5d5c52d4ad2;hpb=2655a377318baf22d2b1bf2d113f47ce1c4af14d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Encode/lib/Encode/JP/JIS.pm b/ext/Encode/lib/Encode/JP/JIS.pm
index 8687821..a3c39d6 100644
--- a/ext/Encode/lib/Encode/JP/JIS.pm
+++ b/ext/Encode/lib/Encode/JP/JIS.pm
@@ -4,8 +4,7 @@ use base 'Encode::Encoding';
 
 use strict;
 
-use vars qw($VERSION);
-$VERSION = do { my @r = (q$Revision: 0.98 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 0.99 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 # Just for the time being, we implement jis-7bit
 # encoding via EUC
@@ -32,19 +31,19 @@ sub encode
     return $res;
 }
 
-use Encode::JP::Constants qw(:all);
+use Encode::CJKConstants qw(:all);
 
 # JIS<->EUC
 
 sub jis_euc {
     my $r_str = shift;
     $$r_str =~ s(
-		 ($RE{JIS_0212}|$RE{JIS_0208}|$RE{JIS_ASC}|$RE{JIS_KANA})
+		 ($RE{JIS_0212}|$RE{JIS_0208}|$RE{ISO_ASC}|$RE{JIS_KANA})
 		 ([^\e]*)
 		 )
     {
 	my ($esc, $str) = ($1, $2);
-	if ($esc !~ /$RE{JIS_ASC}/o) {
+	if ($esc !~ /$RE{ISO_ASC}/o) {
 	    $str =~ tr/\x21-\x7e/\xa1-\xfe/;
 	    if ($esc =~ /$RE{JIS_KANA}/o) {
 		$str =~ s/([\xa1-\xdf])/\x8e$1/og;