diff options
| author | Peter Stephenson <pws@zsh.org> | 2014-02-28 18:45:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2014-02-28 18:45:35 +0000 |
| commit | f798f13b0eba1f31cd2d760441ac9d36a6ac5263 (patch) | |
| tree | 2015479d9fcda696f4b91235bc21bf539ebb6a7c /Completion/Base | |
| parent | users 18531 plus doc etc.: new expand-absolute-path widget (diff) | |
| parent | 32435: improved quoting for ignore-line completion style (diff) | |
| download | zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.gz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.bz2 zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.lz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.xz zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.tar.zst zsh-f798f13b0eba1f31cd2d760441ac9d36a6ac5263.zip | |
Fix merge conflict
Diffstat (limited to 'Completion/Base')
| -rw-r--r-- | Completion/Base/Completer/_expand_alias | 5 | ||||
| -rw-r--r-- | Completion/Base/Core/_description | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Completion/Base/Completer/_expand_alias b/Completion/Base/Completer/_expand_alias index 8848e668d..8240e4162 100644 --- a/Completion/Base/Completer/_expand_alias +++ b/Completion/Base/Completer/_expand_alias @@ -1,7 +1,7 @@ #compdef -K _expand_alias complete-word \C-xa local word expl tmp pre sel what -local -a tmpa +local -a tmpa suf eval "$_comp_setup" @@ -58,7 +58,8 @@ if [[ -n $tmp ]]; then tmp="\\$tmp" |