From 4bca4ee0177ebddff4006e8fdc3f36628349ae11 Mon Sep 17 00:00:00 2001
From: Brian Fraser <fraserbn@gmail.com>
Date: Sat, 6 Aug 2011 10:35:22 +0100
Subject: toke.c: 'No package name allowed for variable %s in "our"' cleanup.

---
 t/uni/parser.t | 10 ++++++++--
 toke.c         |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/t/uni/parser.t b/t/uni/parser.t
index a3e3477d9d..6530b66cc3 100644
--- a/t/uni/parser.t
+++ b/t/uni/parser.t
@@ -7,7 +7,7 @@ BEGIN {
     require './test.pl';
 }
 
-plan (tests => 41);
+plan (tests => 42);
 
 use utf8;
 use open qw( :utf8 :std );
@@ -116,4 +116,10 @@ is ${"main::\345\225\217"}, undef, "..and using the encoded form doesn't";
         eval "$_ Ｆｏｏ $x = 1;";
         like $@, qr/No such class Ｆｏｏ/u, "'No such class' warning for $_ is UTF-8 clean";
     }
-}
\ No newline at end of file
+}
+
+{
+    local $@;
+    eval "our \$main::\x{30cb};";
+    like $@, qr!No package name allowed for variable \$main::\x{30cb} in "our"!, "'No such package name allowed for variable' is UTF-8 clean";
+}
diff --git a/toke.c b/toke.c
index 2fb0a56a0d..aee009e425 100644
--- a/toke.c
+++ b/toke.c
@@ -8472,9 +8472,9 @@ S_pending_ident(pTHX)
     if (PL_in_my) {
         if (PL_in_my == KEY_our) {	/* "our" is merely analogous to "my" */
             if (has_colon)
-                yyerror(Perl_form(aTHX_ "No package name allowed for "
+                yyerror_pv(Perl_form(aTHX_ "No package name allowed for "
                                   "variable %s in \"our\"",
-                                  PL_tokenbuf));
+                                  PL_tokenbuf), UTF ? SVf_UTF8 : 0);
             tmp = allocmy(PL_tokenbuf, tokenbuf_len, UTF ? SVf_UTF8 : 0);
         }
         else {
-- 
cgit v1.2.1