diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-12-11 00:13:03 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-12-11 00:13:03 +0000 |
| commit | de6e73a6cae79e8ccb1fed2d50a2e5ba2cf1dac6 (patch) | |
| tree | c28a1bd49a883010990d734817b6fa3f9651f5f7 | |
| parent | 4736e253beca45aed88ef9a8d5225c7164208c45 (diff) | |
| download | zsh-de6e73a6cae79e8ccb1fed2d50a2e5ba2cf1dac6.tar.gz zsh-de6e73a6cae79e8ccb1fed2d50a2e5ba2cf1dac6.tar.xz zsh-de6e73a6cae79e8ccb1fed2d50a2e5ba2cf1dac6.zip | |
Merge of 24192 by Vincent Lefevre: make GNU make support -include.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/_make | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index e2d8aac60..8c5dc3ba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-10 Peter Stephenson <pws@csr.com> + + * Vincent Lefevre: 24192: Completion/Unix/Command/_make: + make GNU make support -include. + 2007-12-09 Barton E. Schaefer <schaefer@zsh.org> * 24150 plus unposted: Src/exec.c, Test/D08cmdsubst.ztst: @@ -28,7 +33,7 @@ * 24180: Src/utils.c: back off (most of) 24148. - * 24179: Src/exec.c: alter 24170 to use queue_signals(). + * 24179: Src/exec.c: alter 241770 to use queue_signals(). * Guillaume Chazarain: 24170: Src/exec.c: block interrupts around fork since it may mess with locks. diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index 93d4b52da..95d7044e3 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -81,8 +81,8 @@ parseMakefile() { input=${input%%:*} print $(expandVars 10 $input) ;; - ($incl *) - local f=${input##$incl ##} + (${~incl} *) + local f=${input##${~incl} ##} if [[ $incl = '.include' ]]; then f=${f#[\"<]} f=${f%[\">]} @@ -125,7 +125,7 @@ findBasedir () { _pick_variant -r is_gnu gnu=GNU unix -v -f if [[ $is_gnu = gnu ]]; then - incl=include + incl="(-|)include" else incl=.include fi |