36c05fbe8d2582563cdeca678f1d099ba7b52538

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

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

Diff

 1diff --git a/lib/completion.zsh b/lib/completion.zsh
 2index cba90179f28d31ba24c1c4ca77b76e6485632d2c..52cc5b53c0fe14d4b65953d04cee4342122794de 100644
 3--- a/lib/completion.zsh
 4+++ b/lib/completion.zsh
 5@@ -1,4 +1,4 @@
 6-## fixme - the load process here seems a bit bizarre
 7+# fixme - the load process here seems a bit bizarre
 8 
 9 unsetopt menu_complete   # do not autoselect the first completion entry
10 unsetopt flowcontrol
11@@ -30,6 +30,11 @@ zstyle ':completion:*:*:*:*:*' menu select
12 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
13 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
14 
15+# disable named-directories autocompletion
16+zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
17+cdpath=(.)
18+
19+
20 # Load known hosts file for auto-completion with ssh and scp commands
21 if [ -f ~/.ssh/known_hosts ]; then
22   zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
23diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
24index bb45c71eb6f47fc2d082f64c827dc3ff11ac2a5b..c46aea7ac77eb63f7c59ba2c94083f5d56161a5d 100644
25--- a/oh-my-zsh.sh
26+++ b/oh-my-zsh.sh
27@@ -21,5 +21,3 @@ then
28 else
29   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
30 fi
31-
32-unset config_file