diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/glob.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 660917601..2974c4157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-11-08 Clint Adams <clint@zsh.org> + + * unposted: Src/glob.c: revert 26014. + 2008-11-07 Clint Adams <clint@zsh.org> * 26016: Completion/Unix/Command/_bzr: treat "bzr co" as an alias diff --git a/Src/glob.c b/Src/glob.c index ce7de1ed6..f8d7b5ad0 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -693,13 +693,11 @@ parsecomplist(char *instr) if (*(str = instr) == Inpar && !skipparens(Inpar, Outpar, (char **)&str) && *str == Pound && isset(EXTENDEDGLOB) && str[-2] == '/') { instr++; - + if (!(p1 = patcompile(instr, compflags, &instr))) + return NULL; if (instr[0] == '/' && instr[1] == Outpar && instr[2] == Pound) { int pdflag = 0; - if (!(p1 = patcompile(instr, compflags, &instr))) - return NULL; - instr += 3; if (*instr == Pound) { pdflag = 1; |