mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2026-01-02 08:21:09 +01:00
Code Releases Activity

36285: update 36025, context cannot be command and redirect at the same time, redirect wins

Browse source
This commit is contained in:
Barton E. Schaefer 2015-08-26 21:50:13 -07:00
parent caaed169e5
commit 8186e9c94b
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2015-08-26 Barton E. Schaefer <schaefer@zsh.org>
* 36285: Src/Zle/zle_tricky.c: update 36025, context cannot be
command and redirect at the same time, redirect wins
* 36282: Test/A05execution.ztst: discard stderr of "hang" test
2015-08-25 Peter Stephenson <p.w.stephenson@ntlworld.com>

9
Src/Zle/zle_tricky.c
View file

@ -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 = !linredir &&
((incmdpos && !ins && !incond) ||
(oins == 2 && wordpos == 2) ||
(ins == 3 && wordpos == 1) ||
(cmdtok == NULLTOK && !incond));
oins = ins;
/* Get the next token. */
if (linarr)