Upgrade to Encode-2.17

p4raw-id: //depot/perl@28152

diff --git a/ext/Encode/Changes b/ext/Encode/Changes
index a904e3c..cef5e12 100644 (file)
--- a/ext/Encode/Changes
+++ b/ext/Encode/Changes
@@ -3,6 +3,17 @@
 # $Id: Changes,v 2.16 2006/05/03 18:24:10 dankogai Exp $
 #
 $Revision: 2.16 $ $Date: 2006/05/03 18:24:10 $
+! encode.pm
+  'chin' =~ /^zh_CN|chin(?:a|ese)?$/i is true
+  but chin is not china or chinese.
+  http://d.hatena.ne.jp/jankogai/20060508/1147090316
+! Encode.xs
+  Integrated maintperl change (27824|27824) which I overlooked
+  -- sorry, Nicholas and Coverity Scan.
+  Message-Id: <200604152115.k3FLF1Ar014538@smtp3.ActiveState.com>
+  Message-Id: <200605091615.k49GF1gJ016777@smtp3.ActiveState.com>
+
+2.16 2006/05/03 18:24:10
 ! bin/piconv
   --xmlcref and --htmlcref added.
 ! Encode.pm

diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 61a5e89..439d0b1 100644 (file)
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -1,9 +1,9 @@
 #
-# $Id: Encode.pm,v 2.16 2006/05/03 18:32:25 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.17 2006/05/09 17:10:42 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.16 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.17 $ =~ /(\d+)/g;
 sub DEBUG () { 0 }
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );

diff --git a/ext/Encode/encoding.pm b/ext/Encode/encoding.pm
index bf0fc69..cca72fc 100644 (file)
--- a/ext/Encode/encoding.pm
+++ b/ext/Encode/encoding.pm
@@ -83,7 +83,7 @@ sub _get_locale_encoding {
         elsif ( $country_language =~ /^ko_KR|korean?$/i ) {
             $locale_encoding = 'euc-kr';
         }
-        elsif ( $country_language =~ /^zh_CN|chin(?:a|ese)?$/i ) {
+        elsif ( $country_language =~ /^zh_CN|chin(?:a|ese)$/i ) {
             $locale_encoding = 'euc-cn';
         }
         elsif ( $country_language =~ /^zh_TW|taiwan(?:ese)?$/i ) {