summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Src/glob.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ff7ee20c2..34dd4fa42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2013-11-18  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 31995: Han Pingtian: Src/glob.c: glob	qualifiers cannot
+	follow an empty pattern, so a leading paren means grouping
+
 2013-11-17  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
-	* 32001: Src/subst.: fix crash on empty arrays with array
+	* 32001: Src/subst.c: fix crash on empty arrays with array
 	intersection and disjunction.
 
 2013-11-15  Barton E. Schaefer  <schaefer@zsh.org>
diff --git a/Src/glob.c b/Src/glob.c
index e0d0cf68e..385b9e681 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -1171,7 +1171,7 @@ zglob(LinkList list, LinkNode np, int nountok)
 		break;
 	    }
 	}
-	if (*s != Inpar)
+	if (*s != Inpar || s == str)
 	    break;
 	if (isset(EXTENDEDGLOB) && !zpc_disables[ZPC_HASH] && s[1] == Pound) {
 	    if (s[2] == 'q') {