diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2008-11-08 06:31:01 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2008-11-08 06:31:01 +0000 |
| commit | 29852fe2145abdae0da87113dbea37b81dc5d58f (patch) | |
| tree | a66ff16f73de6fa073e0076e60180118ffe8a1b5 | |
| parent | 3a8803a411b697e34652d8e33c11ad86dca99784 (diff) | |
| download | zsh-29852fe2145abdae0da87113dbea37b81dc5d58f.tar.gz zsh-29852fe2145abdae0da87113dbea37b81dc5d58f.tar.xz zsh-29852fe2145abdae0da87113dbea37b81dc5d58f.zip | |
unposted: revert 26014.
| -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; |