diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-15 16:03:30 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-15 16:03:30 -0700 |
| commit | c9e7129341978cf0ba4767b20b31cd2fa712c05f (patch) | |
| tree | 8612ee8c140b950e8b0ebae1e44eadcc8c363aa0 | |
| parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
| parent | 71d94206370c258383beddfa6d3122524c26d8e8 (diff) | |
| download | zsh-c9e7129341978cf0ba4767b20b31cd2fa712c05f.tar.gz zsh-c9e7129341978cf0ba4767b20b31cd2fa712c05f.tar.bz2 zsh-c9e7129341978cf0ba4767b20b31cd2fa712c05f.zip | |
Merge pull request #2602 from blueyed/use-default-hosts-completion-2
Use zsh's default for ':completion:*:hosts'
| -rw-r--r-- | lib/completion.zsh | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index e0cdcf626..6e18e9c82 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -31,22 +31,6 @@ zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories cdpath=(.) -# use /etc/hosts and known_hosts for hostname completion -[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=() -[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() -[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=() -[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=() -hosts=( - "$_ssh_config[@]" - "$_global_ssh_hosts[@]" - "$_ssh_hosts[@]" - "$_etc_hosts[@]" - "$HOST" - localhost -) -zstyle ':completion:*:hosts' hosts $hosts -zstyle ':completion:*' users off - # Use caching so that commands like apt and dpkg complete are useable zstyle ':completion::complete:*' use-cache 1 zstyle ':completion::complete:*' cache-path $ZSH/cache/ |