diff options
author | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
---|---|---|
committer | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
commit | 2595484a97d85496fdcdca99a23f52eecd9b1b43 (patch) | |
tree | fffe23d53a2a635f0861047fb058c8a2632414f7 /lib/completion.zsh | |
parent | 8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (diff) | |
parent | 6e6cf4303712befb5a7fc3918494aefe4a65991f (diff) | |
download | zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.gz zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.bz2 zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
lib/aliases.zsh
Diffstat (limited to 'lib/completion.zsh')
-rw-r--r-- | lib/completion.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index ce59d02fa..e0cdcf626 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -32,7 +32,7 @@ zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-dir 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)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() +[ -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=() |