diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-07-09 19:50:58 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-07-09 19:50:58 +0000 |
| commit | aabd747d4f396bba31c109ec7e11ff36eee14140 (patch) | |
| tree | 6ca6a46ced467dda8c3fbf06b473fd4639f4aa72 | |
| parent | aa563b1a3fa01af1fb1d2036bdf769cbe1fa95d2 (diff) | |
| download | zsh-aabd747d4f396bba31c109ec7e11ff36eee14140.tar.gz zsh-aabd747d4f396bba31c109ec7e11ff36eee14140.tar.xz zsh-aabd747d4f396bba31c109ec7e11ff36eee14140.zip | |
Eric Blake: 27109: don't attachtty() if not interactive
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3a4ca1fc8..c960bbf46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-07-09 Eric Blake <ebb9@byu.net> + + * 27109: Touch up non-interactive MONITOR handling. + Don't mess with tty when MONITOR but not interactive. + +2009-07-09 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 27110: Src/init.c: Only turn on MONITOR if INTERACTIVE is on + or if set explicitly. + 2009-07-08 Peter Stephenson <pws@csr.com> * 27100: Allow MONITOR option in non-interactive shells. @@ -11916,5 +11926,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4729 $ +* $Revision: 1.4730 $ ***************************************************** diff --git a/Src/utils.c b/Src/utils.c index 510a02b65..ad4ffca92 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3590,7 +3590,7 @@ attachtty(pid_t pgrp) { static int ep = 0; - if (jobbing) { + if (jobbing && interact) { #ifdef HAVE_TCSETPGRP if (SHTTY != -1 && tcsetpgrp(SHTTY, pgrp) == -1 && !ep) #else |