Integrate mainline (Win2k/MinGW all ok except threads/t/end.t)

[p5sagit/p5-mst-13.2.git] / ext / Encode / lib / Encode / Tcl / Escape.pm

diff --git a/ext/Encode/lib/Encode/Tcl/Escape.pm b/ext/Encode/lib/Encode/Tcl/Escape.pm
index 5697c99..89290fb 100644 (file)
--- a/ext/Encode/lib/Encode/Tcl/Escape.pm
+++ b/ext/Encode/lib/Encode/Tcl/Escape.pm
@@ -1,6 +1,7 @@
 package Encode::Tcl::Escape;
 use strict;
-our $VERSION = do {my @r=(q$Revision: 1.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r};
+our $VERSION = do { my @r = (q$Revision: 0.92 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+
 use base 'Encode::Encoding';
 
 use Carp;
@@ -31,7 +32,7 @@ sub read
                    $val =~ /[\x30-\x3F]$/ ? 2 : # (only 2 is supported)
                        $val =~ /[\x40-\x5F]$/ ? 2 : # double byte
                            $val =~ /[\x60-\x6F]$/ ? 3 : # triple byte
-                               $val =~ /[\x70-\x7F]$/ ? 4 :
+                               $val =~ /[\x70-\x7E]$/ ? 4 :
                                  # 4 or more (only 4 is supported)
                                    croak("odd sequence is defined");
 
@@ -96,8 +97,8 @@ sub decode
            }
            else
            {
-               # strictly, ([\x20-\x2F]*[\x30-\x7E]). '?' for chopped.
-               $str =~ s/^([\x20-\x2F]*[\x30-\x7E]?)//;
+               # strictly, ([\x21-\x2F]*[\x30-\x7E]). '?' for chopped.
+               $str =~ s/^([\x21-\x2F]*[\x30-\x7E]?)//;
                if ($chk && ! length $str)
                {
                    $str = "\e$1"; # split sequence
@@ -215,7 +216,7 @@ and the following:
   SINGLE SHIFT TWO (SS2)             ESC 04/14
   SINGLE SHIFT THREE (SS3)           ESC 04/15
 
-Designation of control character sets are not supported.
+Designation of control character sets is not supported.
 
 =head1 SEE ALSO