diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2011-05-27 13:54:07 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2011-05-27 13:54:07 +0000 |
| commit | 8a6222a3721badeace3cff76cc02274251d7e0c9 (patch) | |
| tree | d09092c82b0317e60db5f58317abc81c35e9ffb0 | |
| parent | bd2d0636d26c78487e6abc364a116d37a450bf29 (diff) | |
| download | zsh-8a6222a3721badeace3cff76cc02274251d7e0c9.tar.gz zsh-8a6222a3721badeace3cff76cc02274251d7e0c9.tar.xz zsh-8a6222a3721badeace3cff76cc02274251d7e0c9.zip | |
29382: apply 29374 to zccmd_input too.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/Modules/curses.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f390032d5..2f485247d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-05-27 Barton E. Schaefer <schaefer@zsh.org> + + * 29382: Src/Modules/curses.c: apply 29374 to zccmd_input too. + 2011-05-27 Mikael Magnusson <mikachu@gmail.com> * 29331: NEWS: Note g:: parameter expansion flag. @@ -27,7 +31,7 @@ completion for initctl and related system job management utilities. -2011-05-24 Barton E. Schaefer <schaefer@brasslantern.com> +2011-05-24 Barton E. Schaefer <schaefer@zsh.org> * 29368: Src/exec.c: do not restore xtrerr to stderr before running simple commands; restore xtrerr to stderr just before @@ -14843,5 +14847,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5336 $ +* $Revision: 1.5337 $ ***************************************************** diff --git a/Src/Modules/curses.c b/Src/Modules/curses.c index f201847f6..41ad2c6e4 100644 --- a/Src/Modules/curses.c +++ b/Src/Modules/curses.c @@ -1106,7 +1106,7 @@ zccmd_input(const char *nam, char **args) #ifdef HAVE_WGET_WCH while ((ret = wget_wch(w->win, &wi)) == ERR) { - if (errno != EINTR) + if (errno != EINTR || errflag || retflag || breaks || exit_pending) break; } switch (ret) { @@ -1132,7 +1132,7 @@ zccmd_input(const char *nam, char **args) } #else while ((ci = wgetch(w->win)) == ERR) { - if (errno != EINTR) + if (errno != EINTR || errflag || retflag || breaks || exit_pending) return 1; } if (ci >= 256) { |