diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-05-18 09:56:00 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-05-18 09:56:00 +0100 |
| commit | 52aeb9aaeb4799b760138a7c34b18ede4b47242a (patch) | |
| tree | 0da193cbc61ac0000ae0bad210619276f63dccd5 /Completion/Unix/Command/_make | |
| parent | 34a1489f436d95bc2404f8e371130a469cbccebe (diff) | |
| download | zsh-52aeb9aaeb4799b760138a7c34b18ede4b47242a.tar.gz zsh-52aeb9aaeb4799b760138a7c34b18ede4b47242a.zip | |
35168: Improve parsing of case patterns.
"|" is now found properly by looking for words that come
from the lexical analyser, rather than hacking a pattern
returned in one dollop.
Update some completion functions that need extra quoting
as a result.
Add test for new parsing.
Update version number to 5.0.8-dev-3 because of wordcode
incompatibility.
Diffstat (limited to 'Completion/Unix/Command/_make')
| -rw-r--r-- | Completion/Unix/Command/_make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index 225c0af85..c14a34c58 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -65,7 +65,7 @@ _make-parseMakefile () { do case "$input " in # VARIABLE = value OR VARIABLE ?= value - ([[:alnum:]][[:alnum:]_]#[ $TAB]#(\?|)=*) + ([[:alnum:]][[:alnum:]_]#[" "$TAB]#(\?|)=*) var=${input%%[ $TAB]#(\?|)=*} val=${input#*=} val=${val##[ $TAB]#} @@ -74,7 +74,7 @@ _make-parseMakefile () { # VARIABLE := value OR VARIABLE ::= value # Evaluated immediately - ([[:alnum:]][[:alnum:]_]#[ $TAB]#:(:|)=*) + ([[:alnum:]][[:alnum:]_]#[" "$TAB]#:(:|)=*) var=${input%%[ $TAB]#:(:|)=*} val=${input#*=} val=${val##[ $TAB]#} @@ -97,7 +97,7 @@ _make-parseMakefile () { ;; # Include another makefile - (${~incl} *) + (${~incl}" "*) local f=${input##${~incl} ##} if [[ $incl == '.include' ]] then |