diff options
| author | NanoTech <nanotech008@gmail.com> | 2010-09-30 22:23:50 -0600 |
|---|---|---|
| committer | NanoTech <nanotech008@gmail.com> | 2010-09-30 22:23:50 -0600 |
| commit | 02c5fd5bdd0d37bb0e1cb19ad058154f5b7d96a7 (patch) | |
| tree | 2c44274cce756577225ab895d04f004231a04e25 /lib | |
| parent | 8c419ae3b5b77a24485c6a68e6af1a0384db67a8 (diff) | |
| parent | 7a09175bb4c32c7027dab872cd7b80503da3f5d5 (diff) | |
| download | zsh-02c5fd5bdd0d37bb0e1cb19ad058154f5b7d96a7.tar.gz zsh-02c5fd5bdd0d37bb0e1cb19ad058154f5b7d96a7.tar.bz2 zsh-02c5fd5bdd0d37bb0e1cb19ad058154f5b7d96a7.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aliases.zsh | 1 | ||||
| -rw-r--r-- | lib/completion.zsh | 7 | ||||
| -rw-r--r-- | lib/functions.zsh | 2 | ||||
| -rw-r--r-- | lib/key-bindings.zsh | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 80760a1f5..d2d3aed81 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -3,7 +3,6 @@ alias pu='pushd' alias po='popd' # Basic directory operations -alias .='pwd' alias ...='cd ../..' alias -- -='cd -' diff --git a/lib/completion.zsh b/lib/completion.zsh index cba90179f..52cc5b53c 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -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 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:*:*:*:*: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 if [ -f ~/.ssh/known_hosts ]; then zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts ) diff --git a/lib/functions.zsh b/lib/functions.zsh index fcbe994be..561586cba 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -5,7 +5,7 @@ function title { print -nR $'\033k'$1$'\033'\\\ print -nR $'\033]0;'$2$'\a' - elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then + elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then # Use this one instead for XTerms: print -nR $'\033]0;'$*$'\a' fi diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 2e282d66a..7196a88ff 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -20,6 +20,7 @@ bindkey "^[[F" end-of-line bindkey "^[[4~" end-of-line bindkey ' ' magic-space # also do history expansion on space +bindkey '^[[Z' reverse-menu-complete # consider emacs keybindings: |