New upstream version 2.5

6 files changed, 22 insertions, 13 deletions

diff --git a/Changes b/Changes
index 1a1d4f8..aeddf22 100644
--- a/Changes
+++ b/Changes
@@ -189,3 +189,10 @@ of time. Sorry about that.
 2.3  Fri 10 Nov 2017 18:26:29 GMT
     - Make tests work with -Ddefault_inc_excludes_dot
       https://rt.cpan.org/Public/Bug/Display.html?id=120421
+
+2.4  Sat 26 Sep 2020 18:39:17 BST
+    - Names of utf8 lexical vars not reported correctly
+      https://rt.cpan.org/Ticket/Display.html?id=133424
+
+2.5  Sun 27 Sep 2020 13:22:11 BST
+    - Make 2.4 compatible with older perl.
diff --git a/META.json b/META.json
index 139ab29..70bcea2 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "unknown"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
+   "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630",
    "license" : [
       "unknown"
    ],
@@ -37,6 +37,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "2.3",
-   "x_serialization_backend" : "JSON::PP version 2.27400_02"
+   "version" : "2.5"
 }
diff --git a/META.yml b/META.yml
index 62b1ca9..a6baaa2 100644
--- a/META.yml
+++ b/META.yml
@@ -3,21 +3,20 @@ abstract: unknown
 author:
   - unknown
 build_requires:
-  ExtUtils::MakeMaker: '0'
+  ExtUtils::MakeMaker: 0
 configure_requires:
-  ExtUtils::MakeMaker: '0'
+  ExtUtils::MakeMaker: 0
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630'
 license: unknown
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
+  version: 1.4
 name: PadWalker
 no_index:
   directory:
     - t
     - inc
 requires:
-  perl: '5.008001'
-version: '2.3'
-x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
+  perl: 5.008001
+version: 2.5
diff --git a/PadWalker.pm b/PadWalker.pm
index 7e006b9..1af292e 100644
--- a/PadWalker.pm
+++ b/PadWalker.pm
@@ -12,7 +12,7 @@ require 5.008;
 @EXPORT_OK = qw(peek_my peek_our closed_over peek_sub var_name set_closed_over);
 %EXPORT_TAGS = (all => \@EXPORT_OK);
 
-$VERSION = '2.3';
+$VERSION = '2.5';
 
 bootstrap PadWalker $VERSION;
 
diff --git a/PadWalker.xs b/PadWalker.xs
index b76efa1..03e9815 100644
--- a/PadWalker.xs
+++ b/PadWalker.xs
@@ -15,6 +15,10 @@
 #define CvISXSUB(sv) CvXSUB(sv)
 #endif
 
+#ifndef PadnameUTF8
+#  define PadnameUTF8(pn) FALSE
+#endif
+
 /* For development testing */
 #ifdef PADWALKER_DEBUGGING
 # define debug_print(x) printf x
@@ -269,7 +273,7 @@ pads_into_hash(pTHX_ PADNAMELIST* pad_namelist, PAD* pad_vallist, HV* my_hash,
                 if (!val_sv) val_sv = &PL_sv_undef;
               }
 
-              hv_store((is_our ? our_hash : my_hash), name_str, name_len,
+              hv_store((is_our ? our_hash : my_hash), name_str, PadnameUTF8(name_sv) ? -name_len : name_len,
                        (val_sv ? newRV_inc(val_sv) : &PL_sv_undef), 0);
             }
           }
diff --git a/README b/README
index 351e65f..92ebc26 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
-| PadWalker v2.3    - Robin Houston
+| PadWalker v2.5    - Robin Houston
 -----------------------------------------------------------------------------
 
 NAME