more reasonable diagnostic on keyword vs. sub ambiguity

p4raw-id: //depot/perl@1340

1 files changed, 2 insertions, 2 deletions

diff --git a/toke.c b/toke.c
index 22fc2674d4..ad8dfbe9d0 100644
--- a/toke.c
+++ b/toke.c
@@ -2855,8 +2855,8 @@ yylex(void)
 		gv = Nullgv;
 		gvp = 0;
 		if (dowarn && hgv)
-		    warn("Subroutine %s::%s hidden by keyword; use ampersand",
-			 HvNAME(GvESTASH(hgv)), GvENAME(hgv));
+		    warn("Ambiguous call resolved as CORE::%s(), "
+			 "qualify as such or use &", GvENAME(hgv));
 	    }
 	}