From 0768b190ba9347bcfe2d43da2b61eded53173635 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Thu, 11 May 2000 16:39:02 +0000 Subject: 11326: Avoid init_io() on "exec < file" when zleactive. Also fix OPK's slightly confused previous ChangeLog entry. --- ChangeLog | 7 ++++++- Src/exec.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dec29eaa9..daaa88b36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2000-05-11 Bart Schaefer + + * 11326: Src/exec.c: Don't reinitialize SHTTY upon "exec < file" + when ZLE is active. + 2000-05-11 Oliver Kiddle - * 11329: Completion/User/_groups: redirect ypcat to stderr + * 11329: Completion/User/_groups: redirect ypcat stderr to /dev/null 2000-05-11 Sven Wischnowsky diff --git a/Src/exec.c b/Src/exec.c index 7ce553ade..e0247430b 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2097,7 +2097,7 @@ execcmd(Estate state, int input, int output, int how, int last1) /* If this is 'exec < file', read from stdin, * * not terminal, unless `file' is a terminal. */ if (nullexec == 1 && fn->fd1 == 0 && - isset(SHINSTDIN) && interact) + isset(SHINSTDIN) && interact && !zleactive) init_io(); break; case CLOSE: -- cgit 1.4.1