Upgrade Encode from version 2.85 to 2.86

This incorporates all current blead customizations.

14 files changed, 42 insertions, 23 deletions

diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index f9e607a332..bda8e1b316 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encode.pm,v 2.85 2016/08/04 03:15:58 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.86 2016/08/10 18:08:01 dankogai Exp $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.85 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.86 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );
diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs
index b9b079ebc1..6b4fae9f64 100644
--- a/cpan/Encode/Encode.xs
+++ b/cpan/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 2.36 2016/08/04 03:15:58 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.37 2016/08/10 18:08:45 dankogai Exp dankogai $
  */
 
 #define PERL_NO_GET_CONTEXT
@@ -482,6 +482,10 @@ MODULE = Encode		PACKAGE = Encode::utf8	PREFIX = Method_
 
 PROTOTYPES: DISABLE
 
+#ifndef SvIsCOW
+# define SvIsCOW(sv) (SvREADONLY(sv) && SvFAKE(sv))
+#endif
+
 void
 Method_decode_xs(obj,src,check_sv = &PL_sv_no)
 SV *	obj
@@ -499,7 +503,13 @@ CODE:
     dSP; ENTER; SAVETMPS;
     if (src == &PL_sv_undef || SvROK(src)) src = sv_2mortal(newSV(0));
     check = SvROK(check_sv) ? ENCODE_PERLQQ|ENCODE_LEAVE_SRC : SvIV(check_sv);
-    if (!(check & ENCODE_LEAVE_SRC) && SvIsCOW(src)) sv_force_normal(src); // disassociate from any other scalars before doing in-place modifications
+    if (!(check & ENCODE_LEAVE_SRC) && SvIsCOW(src)) {
+        /*
+         * disassociate from any other scalars before doing
+         * in-place modifications
+         */
+        sv_force_normal(src);
+    }
     s = (U8 *) SvPV(src, slen);
     e = (U8 *) SvEND(src);
     /* 
@@ -712,6 +722,17 @@ CODE:
     XSRETURN(1);
 }
 
+
+#ifndef SvPV_force_nolen
+#   define SvPV_force_nolen(sv) SvPV_force_flags_nolen(sv, SV_GMAGIC)
+#endif
+
+#ifndef SvPV_force_flags_nolen
+#   define SvPV_force_flags_nolen(sv, flags) \
+        ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST)) == SVf_POK \
+        ? SvPVX(sv) : sv_pvn_force_flags(sv, &PL_na, flags))
+#endif
+
 void
 Method_encode(obj,src,check_sv = &PL_sv_no)
 SV *	obj
@@ -923,10 +944,6 @@ CODE:
 OUTPUT:
     RETVAL
 
-#ifndef SvIsCOW
-# define SvIsCOW(sv) (SvREADONLY(sv) && SvFAKE(sv))
-#endif
-
 SV *
 _utf8_on(sv)
 SV *	sv
diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL
index f885584d08..c87153bbb3 100644
--- a/cpan/Encode/Makefile.PL
+++ b/cpan/Encode/Makefile.PL
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.PL,v 2.17 2016/08/04 03:15:58 dankogai Exp dankogai $
+# $Id: Makefile.PL,v 2.17 2016/08/04 03:15:58 dankogai Exp $
 #
 use 5.007003;
 use strict;
diff --git a/cpan/Encode/bin/encguess b/cpan/Encode/bin/encguess
index 982449a283..0f344ea3fc 100644
--- a/cpan/Encode/bin/encguess
+++ b/cpan/Encode/bin/encguess
@@ -61,7 +61,7 @@ encguess - guess character encodings of files
 
 =head1 VERSION
 
-$Id: encguess,v 0.2 2016/08/04 03:15:58 dankogai Exp dankogai $
+$Id: encguess,v 0.2 2016/08/04 03:15:58 dankogai Exp $
 
 =head1 SYNOPSIS
 
diff --git a/cpan/Encode/bin/piconv b/cpan/Encode/bin/piconv
index 8249eee517..2218d16f39 100644
--- a/cpan/Encode/bin/piconv
+++ b/cpan/Encode/bin/piconv
@@ -1,5 +1,5 @@
 #!./perl
-# $Id: piconv,v 2.8 2016/08/04 03:15:58 dankogai Exp dankogai $
+# $Id: piconv,v 2.8 2016/08/04 03:15:58 dankogai Exp $
 #
 BEGIN { pop @INC if $INC[-1] eq '.' }
 use 5.8.0;
diff --git a/cpan/Encode/bin/ucmlint b/cpan/Encode/bin/ucmlint
index 0627aaee12..a240f2c75e 100644
--- a/cpan/Encode/bin/ucmlint
+++ b/cpan/Encode/bin/ucmlint
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-# $Id: ucmlint,v 2.3 2016/08/04 03:15:58 dankogai Exp dankogai $
+# $Id: ucmlint,v 2.3 2016/08/04 03:15:58 dankogai Exp $
 #
 
 BEGIN { pop @INC if $INC[-1] eq '.' }
diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm
index fffcaf78ef..754b3acb03 100644
--- a/cpan/Encode/encoding.pm
+++ b/cpan/Encode/encoding.pm
@@ -1,6 +1,6 @@
-# $Id: encoding.pm,v 2.17 2015/09/15 13:53:27 dankogai Exp dankogai $
+# $Id: encoding.pm,v 2.18 2016/08/10 18:08:45 dankogai Exp dankogai $
 package encoding;
-our $VERSION = '2.17_01';
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.18 $ =~ /(\d+)/g;
 
 use Encode;
 use strict;
@@ -160,10 +160,12 @@ sub import {
                 ${^E_NCODING} = $enc;
             }
         }
-        HAS_PERLIO or return 1;
+        if (! HAS_PERLIO ) {
+            return 1;
+        }
     }
     else {
-        warnings::warnif("deprecate",$deprecate) if $deprecate;
+        warnings::warnif("deprecated",$deprecate) if $deprecate;
 
         defined( ${^ENCODING} ) and undef ${^ENCODING};
         undef ${^E_NCODING} if PERL_5_21_7;
diff --git a/cpan/Encode/t/cow.t b/cpan/Encode/t/cow.t
index ab34e05150..9932e9d170 100644
--- a/cpan/Encode/t/cow.t
+++ b/cpan/Encode/t/cow.t
@@ -1,5 +1,5 @@
 #
-# $Id: cow.t,v 1.2 2016/08/04 03:15:58 dankogai Exp dankogai $
+# $Id: cow.t,v 1.2 2016/08/04 03:15:58 dankogai Exp $
 #
 use strict;
 use Encode ();
diff --git a/cpan/Encode/t/decode.t b/cpan/Encode/t/decode.t
index 1062c2d331..6b24a8fa8c 100644
--- a/cpan/Encode/t/decode.t
+++ b/cpan/Encode/t/decode.t
@@ -1,5 +1,5 @@
 #
-# $Id: decode.t,v 1.2 2016/08/04 03:15:58 dankogai Exp dankogai $
+# $Id: decode.t,v 1.2 2016/08/04 03:15:58 dankogai Exp $
 #
 use strict;
 use Encode qw(decode_utf8 FB_CROAK find_encoding decode);
diff --git a/cpan/Encode/t/enc_data.t b/cpan/Encode/t/enc_data.t
index b4015955bb..99ea78d94c 100644
--- a/cpan/Encode/t/enc_data.t
+++ b/cpan/Encode/t/enc_data.t
@@ -1,4 +1,4 @@
-# $Id: enc_data.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
+# $Id: enc_data.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $
 
 BEGIN {
     require Config; import Config;
diff --git a/cpan/Encode/t/enc_eucjp.t b/cpan/Encode/t/enc_eucjp.t
index 37fccba267..952a8ae7bc 100644
--- a/cpan/Encode/t/enc_eucjp.t
+++ b/cpan/Encode/t/enc_eucjp.t
@@ -1,4 +1,4 @@
-# $Id: enc_eucjp.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
+# $Id: enc_eucjp.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $
 # This is the twin of enc_utf8.t .
 
 BEGIN {
diff --git a/cpan/Encode/t/enc_module.t b/cpan/Encode/t/enc_module.t
index 3004ed2bac..8796a9b343 100644
--- a/cpan/Encode/t/enc_module.t
+++ b/cpan/Encode/t/enc_module.t
@@ -1,4 +1,4 @@
-# $Id: enc_module.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
+# $Id: enc_module.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $
 # This file is in euc-jp
 BEGIN {
     require Config; import Config;
diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t
index 047452fb33..7ffaac0f3f 100644
--- a/cpan/Encode/t/enc_utf8.t
+++ b/cpan/Encode/t/enc_utf8.t
@@ -1,4 +1,4 @@
-# $Id: enc_utf8.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
+# $Id: enc_utf8.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $
 # This is the twin of enc_eucjp.t .
 
 BEGIN {
diff --git a/cpan/Encode/t/jperl.t b/cpan/Encode/t/jperl.t
index 5f437fff10..475d8bc0db 100644
--- a/cpan/Encode/t/jperl.t
+++ b/cpan/Encode/t/jperl.t
@@ -1,5 +1,5 @@
 #
-# $Id: jperl.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
+# $Id: jperl.t,v 2.3 2016/08/10 18:08:45 dankogai Exp dankogai $
 #
 # This script is written in euc-jp