Sync Encode version 3.06 into blead

Pumpking okayed merge during code freeze.  This addresses:
https://rt.cpan.org/Ticket/Display.html?id=132471

4 files changed, 9 insertions, 26 deletions

diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index 98a7745e6d..de06ba149e 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,5 +1,5 @@
 #
-# $Id: Encode.pm,v 3.04 2020/03/10 22:26:29 dankogai Exp $
+# $Id: Encode.pm,v 3.06 2020/05/02 02:31:14 dankogai Exp $
 #
 package Encode;
 use strict;
@@ -7,7 +7,7 @@ use warnings;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 our $VERSION;
 BEGIN {
-    $VERSION = sprintf "%d.%02d", q$Revision: 3.04 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%02d", q$Revision: 3.06 $ =~ /(\d+)/g;
     require XSLoader;
     XSLoader::load( __PACKAGE__, $VERSION );
 }
@@ -65,7 +65,7 @@ require Encode::Config;
 eval {
     local $SIG{__DIE__};
     local $SIG{__WARN__};
-    local @INC = @INC;
+    local @INC = @INC || ();
     pop @INC if $INC[-1] eq '.';
     require Encode::ConfigLocal;
 };
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index 7d4669e3c1..1209baa9cd 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -11,7 +11,7 @@ use warnings;
 use Getopt::Std;
 use Config;
 my @orig_ARGV = @ARGV;
-our $VERSION  = do { my @r = (q$Revision: 2.22 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION  = do { my @r = (q$Revision: 2.23 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
@@ -915,24 +915,7 @@ sub decode_U
 }
 
 my @uname;
-sub char_names
-{
- my $s = do "unicore/Name.pl";
- die "char_names: unicore/Name.pl: $!\n" unless defined $s;
- pos($s) = 0;
- while ($s =~ /\G([0-9a-f]+)\t([0-9a-f]*)\t(.*?)\s*\n/igc)
-  {
-   my $name = $3;
-   my $s = hex($1);
-   last if $s >= 0x10000;
-   my $e = length($2) ? hex($2) : $s;
-   for (my $i = $s; $i <= $e; $i++)
-    {
-     $uname[$i] = $name;
-#    print sprintf("U%04X $name\n",$i);
-    }
-  }
-}
+sub char_names{} # cf. https://rt.cpan.org/Ticket/Display.html?id=132471
 
 sub output_ucm_page
 {
diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm
index c3f324d29f..a01833451f 100644
--- a/cpan/Encode/encoding.pm
+++ b/cpan/Encode/encoding.pm
@@ -1,6 +1,6 @@
-# $Id: encoding.pm,v 2.22 2018/02/11 05:32:03 dankogai Exp $
+# $Id: encoding.pm,v 3.00 2020/04/19 10:56:28 dankogai Exp $
 package encoding;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.22 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 3.00 $ =~ /(\d+)/g;
 
 use Encode;
 use strict;
diff --git a/cpan/Encode/lib/Encode/Guess.pm b/cpan/Encode/lib/Encode/Guess.pm
index 41fc19b799..87a725d999 100644
--- a/cpan/Encode/lib/Encode/Guess.pm
+++ b/cpan/Encode/lib/Encode/Guess.pm
@@ -2,7 +2,7 @@ package Encode::Guess;
 use strict;
 use warnings;
 use Encode qw(:fallbacks find_encoding);
-our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 my $Canon = 'Guess';
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
@@ -158,7 +158,7 @@ sub guess {
         $nline++;
     }
     $try{ascii}
-      or return "Encodings too ambiguous: ", join( " or ", keys %try );
+      or return "Encodings too ambiguous: " . join( " or ", keys %try );
     return $try{ascii};
 }