diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-08-30 22:01:55 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-08-30 22:01:55 +0200 |
| commit | 2a4475bbba3adf67ae6e95dc489ca41d0062483f (patch) | |
| tree | be2fec1a3c0487b62b16402c1a73135fe00ccb78 /Src/Zle/zle_tricky.c | |
| parent | a90fb9402a5652391f57e1838399f700ca9a4a4e (diff) | |
| parent | 11189c6df725d682a5b0759f83d0bd5afc0e330a (diff) | |
| download | zsh-2a4475bbba3adf67ae6e95dc489ca41d0062483f.tar.gz zsh-2a4475bbba3adf67ae6e95dc489ca41d0062483f.zip | |
Merge tag 'zsh-5.1' into debian
Diffstat (limited to 'Src/Zle/zle_tricky.c')
| -rw-r--r-- | Src/Zle/zle_tricky.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index b87b99b00..97bdcc020 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1184,11 +1184,12 @@ get_comp_string(void) * considering a new command. Consequently, although this looks * relatively harmless by itself, it's probably incomplete. */ - lincmd = (incmdpos && !ins && !incond) || - (oins == 2 && wordpos == 2) || - (ins == 3 && wordpos == 1) || - (cmdtok == NULLTOK && !incond); linredir = (inredir && !ins); + lincmd = !inredir && + ((incmdpos && !ins && !incond) || + (oins == 2 && wordpos == 2) || + (ins == 3 && wordpos == 1) || + (cmdtok == NULLTOK && !incond)); oins = ins; /* Get the next token. */ if (linarr) |