diff options
| author | Jun T <takimoto-j@kba.biglobe.ne.jp> | 2014-06-11 10:19:24 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-06-11 10:19:24 -0700 |
| commit | e6d7d7b0131109fe130d95d4c5fe585f831e6fe7 (patch) | |
| tree | ee088a46ba61bb2a4422b17561029156627ae124 | |
| parent | d1da134c6327f8099fed3462beaf6a0a501e499b (diff) | |
| download | zsh-e6d7d7b0131109fe130d95d4c5fe585f831e6fe7.tar.gz zsh-e6d7d7b0131109fe130d95d4c5fe585f831e6fe7.tar.xz zsh-e6d7d7b0131109fe130d95d4c5fe585f831e6fe7.zip | |
32767: another spot to tweak bracechardots()
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/glob.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index af357ac93..760c13c24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-11 Barton E. Schaefer <schaefer@zsh.org> + + * Jun T: 32767: Src/glob.c: another spot to tweak bracechardots() + 2014-06-10 Barton E. Schaefer <schaefer@zsh.org> * 32766: Src/glob.c: bracechardots() agrees with xpandbraces() diff --git a/Src/glob.c b/Src/glob.c index f6ae7aa41..1e9195049 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -2141,6 +2141,8 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p) return 0; pnext += 2; if (itok(*pnext)) { + if (*pnext == Inbrace) + return 0; convstr[0] = ztokens[*pnext - Pound]; convstr[1] = '\0'; pconv = convstr; |