Revert the removal of 'use encoding'

We've decided to not remove 'use encoding' in v5.20.

This reverts commits b017fe877ad78f04afaa3c1327fc46391f572bfb,
7053d92917f7cb46452de86dc4c6d8644cae849c, and
b06e47f717f77453fbdaef628efc2b9c83898a8b

7 files changed, 3 insertions, 19 deletions

diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm
index 7bc08f452f..c0bff08873 100644
--- a/cpan/Encode/encoding.pm
+++ b/cpan/Encode/encoding.pm
@@ -102,9 +102,6 @@ sub _get_locale_encoding {
 }
 
 sub import {
-    if ($] >= 5.020) {
-        Carp::croak("encoding: pragma has been removed");
-    }
     if ($] >= 5.017) {
 	warnings::warnif("deprecated",
 			 "Use of the encoding pragma is deprecated")
@@ -212,7 +209,9 @@ encoding - allows you to write your script in non-ascii or non-utf8
 
 =head1 WARNING
 
-This module has been removed after being deprecated since perl 5.18.
+This module is deprecated under perl 5.18.  It uses a mechanism provided by
+perl that is deprecated under 5.18 and higher, and may be removed in a
+future version.
 
 The easiest and the best alternative is to write your script in UTF-8
 and declear:
@@ -221,9 +220,6 @@ and declear:
 
 See L<perluniintro> and L<utf8> for details.
 
-For reference only, the documentation of how it was supposed to work (some
-bugs never got fixed) is below.
-
 =head1 SYNOPSIS
 
   use encoding "greek";  # Perl like Greek to you?
diff --git a/cpan/Encode/t/enc_data.t b/cpan/Encode/t/enc_data.t
index 1a1cfde878..a0caf650f1 100644
--- a/cpan/Encode/t/enc_data.t
+++ b/cpan/Encode/t/enc_data.t
@@ -1,8 +1,6 @@
 # $Id: enc_data.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
 
 BEGIN {
-    print "1..0 # Skip: 'use encoding' has been removed\n";
-    exit 0;
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/enc_eucjp.t b/cpan/Encode/t/enc_eucjp.t
index 96e466ddb0..7c78a68ee9 100644
--- a/cpan/Encode/t/enc_eucjp.t
+++ b/cpan/Encode/t/enc_eucjp.t
@@ -2,8 +2,6 @@
 # This is the twin of enc_utf8.t .
 
 BEGIN {
-    print "1..0 # Skip: 'use encoding' has been removed\n";
-    exit 0;
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/enc_module.t b/cpan/Encode/t/enc_module.t
index 120b7adbd6..05fc6c2f64 100644
--- a/cpan/Encode/t/enc_module.t
+++ b/cpan/Encode/t/enc_module.t
@@ -1,8 +1,6 @@
 # $Id: enc_module.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
 # This file is in euc-jp
 BEGIN {
-    print "1..0 # Skip: 'use encoding' has been removed\n";
-    exit 0;
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t
index ce24b1d047..9c6caa3fa9 100644
--- a/cpan/Encode/t/enc_utf8.t
+++ b/cpan/Encode/t/enc_utf8.t
@@ -2,8 +2,6 @@
 # This is the twin of enc_eucjp.t .
 
 BEGIN {
-    print "1..0 # Skip: 'use encoding' has been removed\n";
-    exit 0;
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/encoding.t b/cpan/Encode/t/encoding.t
index c49e423d61..8c7f253377 100644
--- a/cpan/Encode/t/encoding.t
+++ b/cpan/Encode/t/encoding.t
@@ -1,6 +1,4 @@
 BEGIN {
-    print "1..0 # Skip: 'use encoding' has been removed\n";
-    exit 0;
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/jperl.t b/cpan/Encode/t/jperl.t
index a47dddf969..3abe86b9b7 100644
--- a/cpan/Encode/t/jperl.t
+++ b/cpan/Encode/t/jperl.t
@@ -4,8 +4,6 @@
 # This script is written in euc-jp
 
 BEGIN {
-    print "1..0 # Skip: 'use encoding' has been removed\n";
-    exit 0;
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";