merge upstream

This commit is contained in:
James Cox 2009-09-23 16:14:04 +01:00
commit fdffd77e9c
13 changed files with 150 additions and 29 deletions

View file

@ -1,6 +1,8 @@
## fixme - the load process here seems a bit bizarre
setopt noautomenu
setopt COMPLETE_IN_WORD
setopt ALWAYS_TO_END
setopt complete_in_word
setopt always_to_end
unsetopt flowcontrol
@ -18,8 +20,9 @@ zstyle ':completion:*' list-colors ''
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
unsetopt MENU_COMPLETE
setopt AUTO_MENU
#setopt AUTO_MENU
# should this be in keybindings?
bindkey -M menuselect '^o' accept-and-infer-next-history
zstyle ':completion:*:*:*:*:*' menu yes select
@ -28,3 +31,10 @@ zstyle ':completion:*:*:*:*:*' menu yes 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"
zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
#complete on history
# zstyle ':completion:*:history-words' stop yes
# zstyle ':completion:*:history-words' remove-all-dups yes
# zstyle ':completion:*:history-words' list false
# zstyle ':completion:*:history-words' menu yes