diff options
author | Wayne Davison <wayned@users.sourceforge.net> | 2004-08-21 03:07:01 +0000 |
---|---|---|
committer | Wayne Davison <wayned@users.sourceforge.net> | 2004-08-21 03:07:01 +0000 |
commit | 60b7d10a80aec0bc9135f463d1d8f9c2f6dd675c (patch) | |
tree | cbeec1981c7f347c6072503d0486918da829b642 | |
parent | 1f42dc4008709f3b791d1f53c689c6728ecde6c5 (diff) | |
download | zsh-60b7d10a80aec0bc9135f463d1d8f9c2f6dd675c.tar.gz zsh-60b7d10a80aec0bc9135f463d1d8f9c2f6dd675c.tar.xz zsh-60b7d10a80aec0bc9135f463d1d8f9c2f6dd675c.zip |
- Fixed the perl code that was using the @matches array.
- Simplified the other perl code just a little.
-rw-r--r-- | Completion/Unix/Command/_make | 7 |
1 files changed, 3 insertions, 4 deletions
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+\<bsd\.port\.(subdir\.|pre\.)?mk>/ || /^\.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 |