Merge branch 'named_dirs_completion' of http://github.com/kremso/oh-my-zsh into kremso-named_dirs_completion

This commit is contained in:
Robby Russell 2010-09-30 20:50:00 -07:00
commit 36c05fbe8d
2 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,4 @@
## fixme - the load process here seems a bit bizarre # fixme - the load process here seems a bit bizarre
unsetopt menu_complete # do not autoselect the first completion entry unsetopt menu_complete # do not autoselect the first completion entry
unsetopt flowcontrol unsetopt flowcontrol
@ -30,6 +30,11 @@ zstyle ':completion:*:*:*:*:*' menu select
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01' zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w" zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
# disable named-directories autocompletion
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
cdpath=(.)
# Load known hosts file for auto-completion with ssh and scp commands # Load known hosts file for auto-completion with ssh and scp commands
if [ -f ~/.ssh/known_hosts ]; then if [ -f ~/.ssh/known_hosts ]; then
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts ) zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )

View File

@ -21,5 +21,3 @@ then
else else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi fi
unset config_file