Integrate change #11519 from perlio:

Avoid testing for (non-)existance of "encoding(xxxx)"
layer is called "encoding" the (xxxx) is an argument.

p4raw-link: @11519 on //depot/perl: cb7ddd31f93d0675b449b95767297ddc411dbc09

p4raw-id: //depot/perl@11617

diff --git a/lib/open.pm b/lib/open.pm
index 1456666..3d7782f 100644 (file)
--- a/lib/open.pm
+++ b/lib/open.pm
@@ -71,9 +71,10 @@ sub import {
                } else {
                    $layer = "encoding($locale_encoding)";
                }
-           }
-           unless(PerlIO::Layer::->find($layer)) {
-               carp("Unknown discipline layer '$layer'");
+           } else {
+               unless(PerlIO::Layer::->find($layer)) {
+                   carp("Unknown discipline layer '$layer'");
+               }
            }
            push(@val,":$layer");
            if ($layer =~ /^(crlf|raw)$/) {