mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-12 01:11:27 +02:00
11326: Avoid init_io() on "exec < file" when zleactive.
Also fix OPK's slightly confused previous ChangeLog entry.
This commit is contained in:
parent
a39eb7948e
commit
0768b190ba
2 changed files with 7 additions and 2 deletions
|
@ -1,6 +1,11 @@
|
||||||
|
2000-05-11 Bart Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
|
* 11326: Src/exec.c: Don't reinitialize SHTTY upon "exec < file"
|
||||||
|
when ZLE is active.
|
||||||
|
|
||||||
2000-05-11 Oliver Kiddle <opk@zsh.org>
|
2000-05-11 Oliver Kiddle <opk@zsh.org>
|
||||||
|
|
||||||
* 11329: Completion/User/_groups: redirect ypcat to stderr
|
* 11329: Completion/User/_groups: redirect ypcat stderr to /dev/null
|
||||||
|
|
||||||
2000-05-11 Sven Wischnowsky <wischnow@zsh.org>
|
2000-05-11 Sven Wischnowsky <wischnow@zsh.org>
|
||||||
|
|
||||||
|
|
|
@ -2097,7 +2097,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
|
||||||
/* If this is 'exec < file', read from stdin, *
|
/* If this is 'exec < file', read from stdin, *
|
||||||
* not terminal, unless `file' is a terminal. */
|
* not terminal, unless `file' is a terminal. */
|
||||||
if (nullexec == 1 && fn->fd1 == 0 &&
|
if (nullexec == 1 && fn->fd1 == 0 &&
|
||||||
isset(SHINSTDIN) && interact)
|
isset(SHINSTDIN) && interact && !zleactive)
|
||||||
init_io();
|
init_io();
|
||||||
break;
|
break;
|
||||||
case CLOSE:
|
case CLOSE:
|
||||||
|
|
Loading…
Reference in a new issue