diff options
| author | Daniel Schauenberg <d@unwiredcouch.com> | 2010-10-01 10:55:44 +0200 |
|---|---|---|
| committer | Daniel Schauenberg <d@unwiredcouch.com> | 2010-10-01 10:55:44 +0200 |
| commit | d340bfab3345a223114b09d589356ff18a1a3efd (patch) | |
| tree | 10efcbced0aedcbbc0ac0fc759d00734fefdc341 /lib | |
| parent | cef6dcd98bb42c5ca2613bbbef12dd384ec8e33a (diff) | |
| parent | 26d97a9355d37c55e0b044d8dafc425cc0ca7217 (diff) | |
| download | zsh-d340bfab3345a223114b09d589356ff18a1a3efd.tar.gz zsh-d340bfab3345a223114b09d589356ff18a1a3efd.tar.bz2 zsh-d340bfab3345a223114b09d589356ff18a1a3efd.zip | |
Merge remote branch 'origin/master' into restructure_plugins
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/completion.zsh | 7 | ||||
| -rw-r--r-- | lib/functions.zsh | 2 | ||||
| -rw-r--r-- | lib/key-bindings.zsh | 1 |
3 files changed, 8 insertions, 2 deletions
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: |