Merge remote-tracking branch 'robbyrussell/master' into develop

Conflicts:
	.gitignore
	README.textile
	lib/aliases.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/misc.zsh
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Shawn Sorichetti 2012-01-26 09:04:31 -05:00
commit ced4f4decc
111 changed files with 4273 additions and 378 deletions

View file

@ -14,13 +14,19 @@ bindkey '^[[B' down-line-or-search
bindkey "^[[H" beginning-of-line
bindkey "^[[1~" beginning-of-line
bindkey "^[OH" beginning-of-line
bindkey "^[[F" end-of-line
bindkey "^[[4~" end-of-line
bindkey "^[OF" end-of-line
bindkey ' ' magic-space # also do history expansion on space
bindkey "^[[1;5C" forward-word
bindkey "^[[1;5D" backward-word
bindkey '^[[Z' reverse-menu-complete
# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
bindkey '^?' backward-delete-char
bindkey "^[[3~" delete-char
bindkey "^[3;5~" delete-char
bindkey "\e[3~" delete-char