diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2018-02-26 21:43:12 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2018-02-26 21:43:12 +0000 |
| commit | 1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67 (patch) | |
| tree | 764b0d08c1934f1d237ae827a42c017c7c7909a4 /Src/Zle | |
| parent | 42401: workaround for gcc -foptimize-strlen oddit. (diff) | |
| download | zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.tar zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.tar.gz zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.tar.bz2 zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.tar.lz zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.tar.xz zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.tar.zst zsh-1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67.zip | |
23180: Fix expand-or-complete with ~[...].
The square brackets shouldn't be treated as wildcards.
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/zle_tricky.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index caeef7692..22c381237 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -456,6 +456,7 @@ checkparams(char *p) static int cmphaswilds(char *str) { + char *ptr; if ((*str == Inbrack || *str == Outbrack) && !str[1]) return 0; @@ -465,6 +466,14 @@ cmphaswilds(char *str) if (str[0] == '%' && str[1] ==Quest) str += 2; + /* + * In ~[foo], the square brackets are not wild cards. + * This test matches the master one in filesubstr(). + */ + if (*str == Tilde && str[1] == Inbrack && + (ptr = strchr(str+2, Outbrack))) + str = ptr + 1; + for (; *str;) { if (*str == String || *str == Qstring) { /* A parameter expression. */ |