mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-23 04:51:12 +02:00
27429: _make: restore variable value completion
make indentation more standard
This commit is contained in:
parent
b97284cde2
commit
85842387f8
2 changed files with 174 additions and 171 deletions
|
@ -1,5 +1,8 @@
|
|||
2009-11-24 Peter Stephenson <pws@csr.com>
|
||||
|
||||
* 27429: Completion/Unix/Command/_make: restore variable value
|
||||
completion. Also make indentation more standard (not posted).
|
||||
|
||||
* Michael Hwang <michael.a.hwang@gmail.com>: 27428:
|
||||
Completion/Unix/Command/_make: complete rewrite with
|
||||
variable completion.
|
||||
|
@ -12387,5 +12390,5 @@
|
|||
|
||||
*****************************************************
|
||||
* This is used by the shell to define $ZSH_PATCHLEVEL
|
||||
* $Revision: 1.4821 $
|
||||
* $Revision: 1.4822 $
|
||||
*****************************************************
|
||||
|
|
|
@ -50,7 +50,9 @@ expandVars() {
|
|||
ret=${ret//\$$open$var$close/$val}
|
||||
;;
|
||||
|
||||
(*) # Improper variable name. No replacement. I'm not sure if this is desired behavior.
|
||||
(*)
|
||||
# Improper variable name. No replacement.
|
||||
# I'm not sure if this is desired behavior.
|
||||
front+="\$$open$var$close"
|
||||
ret=${ret/\$$open$var$close/}
|
||||
;;
|
||||
|
@ -197,7 +199,10 @@ else
|
|||
|
||||
if [[ $PREFIX == (#b)([^=]##)'='* ]] && [[ -n ${${(k)VARIABLES}[(r)${match[1]}]} ]]
|
||||
then
|
||||
_message 'override make variable'
|
||||
# Complete make variable as if shell variable
|
||||
compstate[parameter]="${PREFIX%%\=*}"
|
||||
compset -P 1 '*='
|
||||
_value "$@"
|
||||
else
|
||||
_tags targets variables
|
||||
while _tags
|
||||
|
@ -208,9 +213,4 @@ else
|
|||
compadd -S '=' -- ${(k)VARIABLES}
|
||||
done
|
||||
fi
|
||||
|
||||
# These are left over from the old completion. I'm not sure what they do.
|
||||
#compstate[parameter]="${PREFIX%%\=*}"
|
||||
#compset -P 1 '*='
|
||||
#_value "$@"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue