In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/7cb258c16018b4c963dd48cee7578d26045ff04c?hp=e18c4116c82b2027a1e5d4e6b9a7214d60779053>

- Log -----------------------------------------------------------------
commit 7cb258c16018b4c963dd48cee7578d26045ff04c
Author: Abigail <[email protected]>
Date:   Mon Jan 23 22:29:19 2017 +0100

    Be consistent in deprecation messages.
    
    Changed one deprecation message to not use a leading v in the Perl
    version number, as the other deprecation messages don't have them
    either.
-----------------------------------------------------------------------

Summary of changes:
 pod/perldelta.pod   | 5 ++++-
 pod/perldiag.pod    | 2 +-
 t/lib/warnings/toke | 2 +-
 toke.c              | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index f72776ea94..20393a4610 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -204,7 +204,10 @@ XXX Changes (i.e. rewording) of diagnostic messages go here
 
 =item *
 
-XXX Describe change here
+Use of unassigned code point or non-standalone grapheme for a delimiter will 
be a fatal error starting in Perl 5.30
+
+This was changed to drop a leading C<v> in C<v5.30>, so it uses the same
+style as other deprecation messages.
 
 =back
 
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 9038b2bee2..585c512753 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -7112,7 +7112,7 @@ but will become a fatal error in a future version of 
perl.  Untaint your
 arguments.  See L<perlsec>.
 
 =item Use of unassigned code point or non-standalone grapheme for a
-delimiter will be a fatal error starting in Perl v5.30
+delimiter will be a fatal error starting in Perl 5.30
 
 (D deprecated)
 A grapheme is what appears to a native-speaker of a language to be a
diff --git a/t/lib/warnings/toke b/t/lib/warnings/toke
index fe8adc5178..64b7a46c18 100644
--- a/t/lib/warnings/toke
+++ b/t/lib/warnings/toke
@@ -1619,4 +1619,4 @@ BEGIN{
 use utf8;
 my $a = qr ̂foobar̂;
 EXPECT
-Use of unassigned code point or non-standalone grapheme for a delimiter will 
be a fatal error starting in Perl v5.30 at - line 8.
+Use of unassigned code point or non-standalone grapheme for a delimiter will 
be a fatal error starting in Perl 5.30 at - line 8.
diff --git a/toke.c b/toke.c
index 3f13f76a8b..10669de57d 100644
--- a/toke.c
+++ b/toke.c
@@ -10412,7 +10412,7 @@ S_scan_str(pTHX_ char *start, int 
keep_bracketed_quoted, int keep_delims, int re
     const char * non_grapheme_msg = "Use of unassigned code point or"
                                     " non-standalone grapheme for a delimiter"
                                     " will be a fatal error starting in Perl"
-                                    " v5.30";
+                                    " 5.30";
     /* The only non-UTF character that isn't a stand alone grapheme is
      * white-space, hence can't be a delimiter.  So can skip for non-UTF-8 */
     bool check_grapheme = UTF && ckWARN_d(WARN_DEPRECATED);

--
Perl5 Master Repository

Reply via email to