diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-08-26 22:16:12 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-08-26 22:16:12 -0700 |
| commit | 85645fd683761090e55b9979cd3a4115dfec23c8 (patch) | |
| tree | d29dcd19e02fc165425d904b886de9eb3232d27f | |
| parent | 8186e9c94b6536b7e9ed8b40c467922c8d639f6d (diff) | |
| download | zsh-85645fd683761090e55b9979cd3a4115dfec23c8.tar.gz zsh-85645fd683761090e55b9979cd3a4115dfec23c8.tar.xz zsh-85645fd683761090e55b9979cd3a4115dfec23c8.zip | |
36288: refine 36825, slightly different test for redirect context
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4b357044e..73a8e7217 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-08-26 Barton E. Schaefer <schaefer@zsh.org> + * 36288: Src/Zle/zle_tricky.c: refine 36825, slightly different + test for redirect context + * 36285: Src/Zle/zle_tricky.c: update 36025, context cannot be command and redirect at the same time, redirect wins diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index cb17bdeca..97bdcc020 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1185,7 +1185,7 @@ get_comp_string(void) * relatively harmless by itself, it's probably incomplete. */ linredir = (inredir && !ins); - lincmd = !linredir && + lincmd = !inredir && ((incmdpos && !ins && !incond) || (oins == 2 && wordpos == 2) || (ins == 3 && wordpos == 1) || |