diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-29 07:10:31 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-29 07:10:31 +0000 |
| commit | d15f36ab5b7b2a15e9fc613de59e6ff1d586a7c7 (patch) | |
| tree | d88abd9923b0a40f196f46c22452e63437238216 | |
| parent | 4e2e7f292faccc162e4c87e7fc2852dc7faceea0 (diff) | |
| download | zsh-d15f36ab5b7b2a15e9fc613de59e6ff1d586a7c7.tar.gz zsh-d15f36ab5b7b2a15e9fc613de59e6ff1d586a7c7.tar.xz zsh-d15f36ab5b7b2a15e9fc613de59e6ff1d586a7c7.zip | |
change suffix style to still do expansion if the suffix contains something to expand (12115)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Core/_expand | 2 | ||||
| -rw-r--r-- | Doc/Zsh/compsys.yo | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 126e81a3a..3eaf88a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-06-29 Sven Wischnowsky <wischnow@zsh.org> + * 12115: Completion/Core/_expand, Doc/Zsh/compsys.yo: change + suffix style to still do expansion if the suffix contains + something to expand + * 12114: Completion/Core/_main_complete, Doc/Zsh/compsys.yo: even more fun with the menu style (no=num, yes=long-list, reverse meaning of yes=num) diff --git a/Completion/Core/_expand b/Completion/Core/_expand index d0f8d8327..12c31860b 100644 --- a/Completion/Core/_expand +++ b/Completion/Core/_expand @@ -36,7 +36,7 @@ fi [[ "$word" = *\$\{[^\}]# ]] && return 1 zstyle -T ":completion:${curcontext}:" suffix && - [[ "$word" = (\~*/*|\$[a-zA-Z0-9_\[\]]##[^a-zA-Z0-9_\[\]]*|\$\{*\}?*) ]] && + [[ "$word" = (\~*/|\$(|[=~#^+])[a-zA-Z0-9_\[\]]##[^a-zA-Z0-9_\[\]]|\$\{*\}?)[^\$\{\}\(\)\<\>?^*#~]# ]] && return 1 zstyle -t ":completion:${curcontext}:" accept-exact || diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index a4f3f2214..e9b5ca9fe 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -1888,7 +1888,8 @@ This is used by the tt(_expand) completer if the word starts with a tilde or parameter expansion. If it is set to `true', the word will only be expanded if it doesn't have a suffix, i.e. if it is something like `tt(~foo)' or `tt($foo)', but not if it is `tt(~foo/)' or -`tt($foo/bar)'. The default for this style is `true'. +`tt($foo/bar)', unless that suffix itself contains characters eligible +for expansion. The default for this style is `true'. ) kindex(tag-order, completion style) item(tt(tag-order))( |