From 60b7d10a80aec0bc9135f463d1d8f9c2f6dd675c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 21 Aug 2004 03:07:01 +0000 Subject: - Fixed the perl code that was using the @matches array. - Simplified the other perl code just a little. --- Completion/Unix/Command/_make | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Completion/Unix/Command/_make') diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index dc4999634..93dfcf866 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -27,19 +27,18 @@ else if [[ $is_gnu = gnu ]] && zstyle -t ":completion:${curcontext}:targets" call-command; then if [[ -n $useperl ]]; then - cmdargs=(perl -F: -ane '/^[a-zA-Z0-9][^\/\t=]+:([^=]|$)/ && print "$F[0]\n"') + cmdargs=(perl -ne '/^([a-zA-Z0-9][^\/\t=]+):([^=]|$)/ && print "$1\n"') else cmdargs=(awk '/^[a-zA-Z0-9][^\/\t=]+:([^=]|$)/ {print $1}' FS=:) fi tmp=( $(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null | $cmdargs) ) elif [[ -n $useperl ]]; then tmp=( - $(perl -ne '@matches = /^(?:([a-zA-Z0-9]+[^\/\t=\s]+)\s*)+:(?:[^=]|$)/ and - print join(" ", @matches), "\n"; + $(perl -ne '/^([a-zA-Z0-9][^\/\t=]+):([^=]|$)/ and print "$1\n"; if (/^\.include\s+\/ || /^\.include\s+\".*mk\/bsd\.pkg\.(subdir\.)?mk\"/) { print "fetch fetch-list extract patch configure build install reinstall deinstall package describe checkpatch checksum makesum\n"; - } +} ' $file) ) else -- cgit 1.4.1