mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-03 10:21:46 +02:00
29382: apply 29374 to zccmd_input too.
This commit is contained in:
parent
bd2d0636d2
commit
8a6222a372
2 changed files with 8 additions and 4 deletions
|
@ -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 $
|
||||
*****************************************************
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue