mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 13:01:28 +02:00
Code Releases Activity

29382: apply 29374 to zccmd_input too.

Browse source
This commit is contained in:
Bart Schaefer 2011-05-27 13:54:07 +00:00
parent bd2d0636d2
commit 8a6222a372
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2011-05-27 Mikael Magnusson <mikachu@gmail.com>
* 29331: NEWS: Note g:: parameter expansion flag. * 29331: NEWS: Note g:: parameter expansion flag.
@ -27,7 +31,7 @@
completion for initctl and related system job management completion for initctl and related system job management
utilities. 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 * 29368: Src/exec.c: do not restore xtrerr to stderr before
running simple commands; restore xtrerr to stderr just before running simple commands; restore xtrerr to stderr just before
@ -14843,5 +14847,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5336 $ * $Revision: 1.5337 $
***************************************************** *****************************************************

4
Src/Modules/curses.c
View file

@ -1106,7 +1106,7 @@ zccmd_input(const char *nam, char **args)
#ifdef HAVE_WGET_WCH #ifdef HAVE_WGET_WCH
while ((ret = wget_wch(w->win, &wi)) == ERR) { while ((ret = wget_wch(w->win, &wi)) == ERR) {
if (errno != EINTR) if (errno != EINTR || errflag || retflag || breaks || exit_pending)
break; break;
} }
switch (ret) { switch (ret) {
@ -1132,7 +1132,7 @@ zccmd_input(const char *nam, char **args)
} }
#else #else
while ((ci = wgetch(w->win)) == ERR) { while ((ci = wgetch(w->win)) == ERR) {
if (errno != EINTR) if (errno != EINTR || errflag || retflag || breaks || exit_pending)
return 1; return 1;
} }
if (ci >= 256) { if (ci >= 256) {