2 files changed, 10 insertions, 1 deletions
diff --git a/lib/Text/Abbrev.pm b/lib/Text/Abbrev.pm
index 08143fea8f..d7feedc30d 100644
--- a/lib/Text/Abbrev.pm
+++ b/lib/Text/Abbrev.pm
@@ -43,6 +43,7 @@ The values are the original list elements.
 sub abbrev {
     my ($word, $hashref, $glob, %table, $returnvoid);
 
+    @_ or return;   # So we don't autovivify onto @_ and trigger warning
     if (ref($_[0])) {           # hash reference preferably
       $hashref = shift;
       $returnvoid = 1;
diff --git a/lib/Text/Abbrev.t b/lib/Text/Abbrev.t
index fb5a9841eb..38d4a39886 100644
--- a/lib/Text/Abbrev.t
+++ b/lib/Text/Abbrev.t
@@ -1,6 +1,6 @@
 #!./perl
 
-print "1..7\n";
+print "1..8\n";
 
 BEGIN {
     chdir 't' if -d 't';
@@ -49,3 +49,11 @@ abbrev \%y, @z;
 
 $s = join ':', sort keys %y;
 print (($r eq $s)?"ok $test\n":"not ok $test\n"); $test++;
+
+
+# warnings safe with zero arguments
+my $notok;
+$^W = 1;
+$SIG{__WARN__} = sub { $notok++ };
+abbrev();
+print ($notok ? "not ok $test\n" : "ok $test\n"); $test++;