summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/glob.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 967f51684..eec56154d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,11 @@
 	* 33859 with typo fix: Completion/Base/Core/_main_complete: to
 	propagate signal from trap we need to use function style.
 
+2014-12-05  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 33854: Src/glob.c: errors end recursion through scanner(), which
+	makes **/ more easily interruptible
+
 2014-12-04  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 33841: Doc/Zsh/params.yo: explain array append a bit better
diff --git a/Src/glob.c b/Src/glob.c
index ca7bc4410..b3903f2ff 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -463,7 +463,7 @@ scanner(Complist q, int shortcircuit)
     int errssofar = errsfound;
     struct dirsav ds;
 
-    if (!q)
+    if (!q || errflag)
 	return;
     init_dirsav(&ds);