From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 5 Apr 2002 18:02:26 +0000 (+0000)
Subject: Retract #15745 for now; won't work without more Encode fixes.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=324bf92d279c70addc0883a496a9bdceeeea01a5;p=p5sagit%2Fp5-mst-13.2.git

Retract #15745 for now; won't work without more Encode fixes.

p4raw-id: //depot/perl@15750
---

diff --git a/ext/Encode/lib/Encode/10646_1.pm b/ext/Encode/lib/Encode/10646_1.pm
index e3d3ffa..db39210 100644
--- a/ext/Encode/lib/Encode/10646_1.pm
+++ b/ext/Encode/lib/Encode/10646_1.pm
@@ -6,7 +6,7 @@ use base 'Encode::Encoding';
 # Encoding is 16-bit network order Unicode (no surogates)
 # Used for X font encodings
 
-__PACKAGE__->Define(qw(UCS-2BE UCS-2));
+__PACKAGE__->Define(qw(UCS-2));
 
 sub decode
 {
@@ -18,7 +18,7 @@ sub decode
 	$uni .= chr($code);
     }
     $_[1] = $str if $chk;
-    utf8::upgrade($uni);
+  utf8::upgrade($uni);
     return $uni;
 }
 
@@ -30,7 +30,7 @@ sub encode
     {
 	my $ch = substr($uni,0,1,'');
 	my $x  = ord($ch);
-	unless ($x <= 0xffff)
+	unless ($x < 32768)
 	{
 	    last if ($chk);
 	    $x = 0;