Merge SJL's fork with upstream

Merge branch 'master' of https://github.com/sjl/oh-my-zsh

Conflicts:
	README.textile
	lib/git.zsh
	oh-my-zsh.sh
This commit is contained in:
Jeffrey Horn 2012-01-19 14:27:51 -05:00
commit 7bebacbb87
26 changed files with 1310 additions and 67 deletions

View file

@ -11,6 +11,8 @@ bindkey "^[[6~" down-line-or-history
# make search up and down work, so partially type and hit up/down to find relevant stuff
bindkey '^[[A' up-line-or-search
bindkey '^[[B' down-line-or-search
bindkey '^p' up-line-or-search
bindkey '^n' down-line-or-search
bindkey "^[[H" beginning-of-line
bindkey "^[[1~" beginning-of-line
@ -31,21 +33,6 @@ bindkey "^[[3~" delete-char
bindkey "^[3;5~" delete-char
bindkey "\e[3~" delete-char
# consider emacs keybindings:
#bindkey -e ## emacs key bindings
#
#bindkey '^[[A' up-line-or-search
#bindkey '^[[B' down-line-or-search
#bindkey '^[^[[C' emacs-forward-word
#bindkey '^[^[[D' emacs-backward-word
#
#bindkey -s '^X^Z' '%-^M'
#bindkey '^[e' expand-cmd-path
#bindkey '^[^I' reverse-menu-complete
#bindkey '^X^N' accept-and-infer-next-history
#bindkey '^W' kill-region
#bindkey '^I' complete-word
## Fix weird sequence that rxvt produces
#bindkey -s '^[[Z' '\t'
#