summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2013-11-19 08:30:10 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2013-11-19 08:30:10 -0800
commitb514fbe110f548df45f1de6064c1ac2a4037b917 (patch)
tree5f1ba6deed97f4328e529d5e5fdd21cdbaf6902a
parent49959a35df8d22d8ccb5fc9ef726953d5ae7f891 (diff)
downloadzsh-b514fbe110f548df45f1de6064c1ac2a4037b917.tar.gz
zsh-b514fbe110f548df45f1de6064c1ac2a4037b917.tar.xz
zsh-b514fbe110f548df45f1de6064c1ac2a4037b917.zip
32023: better interrupt handling at RM_STAR_WAIT
-rw-r--r--ChangeLog4
-rw-r--r--Src/utils.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d2a847066..0025d0fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-19  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 32023: Src/utils.c: better interrupt handling at RM_STAR_WAIT
+
 2013-11-18  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* unposted but see 32012: Doc/help/.cvsignore,
diff --git a/Src/utils.c b/Src/utils.c
index d1d9406c2..0db9c30a6 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2299,6 +2299,8 @@ checkrmall(char *s)
 	sleep(10);
 	fputc('\n', shout);
     }
+    if (errflag)
+      return 0;
     fputs(" [yn]? ", shout);
     fflush(shout);
     zbeep();