X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FAbbrev.pm;h=ae6797c81ac8f2100598efd3346ecebfa7385c66;hb=28e1f846b855b70837afc0a54acecb5b653e99fc;hp=893f3b172980445c85947fecdfbf9e0b6cc414d8;hpb=ac323e15ded2bfe9f2b682e2c761a4505058fedc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Text/Abbrev.pm b/lib/Text/Abbrev.pm
index 893f3b1..ae6797c 100644
--- a/lib/Text/Abbrev.pm
+++ b/lib/Text/Abbrev.pm
@@ -54,10 +54,11 @@ sub abbrev {
 	my $abbrev = shift(@extra);
 	my $len = 1;
         my $cmp;
-	foreach $cmp (@cmp) {
+	WORD: foreach $cmp (@cmp) {
 	    next if $cmp eq $name;
 	    while (substr($cmp,0,$len) eq $abbrev) {
-		$abbrev .= shift(@extra);
+                last WORD unless @extra;
+                $abbrev .= shift(@extra);
 		++$len;
 	    }
 	}