linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more better fixing

Browse source
This commit is contained in:
Steven Lu 2013-07-23 19:51:59 -04:00
commit c0b1058149
2 changed files with 4 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/history-substring-search/history-substring-search.zsh
View file

@ -434,8 +434,6 @@ function _history-substring-search-down-buffer() {
false false
} }
HISTORY_PATH_SEPARATOR="///; "
function _history-substring-search-up-history() { function _history-substring-search-up-history() {
# #
# Behave like up in ZSH, except clear the $BUFFER # Behave like up in ZSH, except clear the $BUFFER
@ -449,8 +447,7 @@ function _history-substring-search-up-history() {
# going up from somewhere below the top of history # going up from somewhere below the top of history
else else
((HISTNO--)) zle up-history
BUFFER=${history[$HISTNO]#*$HISTORY_PATH_SEPARATOR}
fi fi
return true return true
@ -473,8 +470,7 @@ function _history-substring-search-down-history() {
# going down from somewhere above the bottom of history # going down from somewhere above the bottom of history
else else
((HISTNO++)) zle down-history
BUFFER=${history[$HISTNO]#*$HISTORY_PATH_SEPARATOR}
fi fi
return true return true
@ -521,7 +517,7 @@ function _history-substring-search-up-search() {
# to highlight the current buffer. # to highlight the current buffer.
# #
(( _history_substring_search_match_index-- )) (( _history_substring_search_match_index-- ))
BUFFER=${history[$_history_substring_search_matches[$_history_substring_search_match_index]]#*$HISTORY_PATH_SEPARATOR} BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
_history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
elif [[ $_history_substring_search_match_index -eq 1 ]]; then elif [[ $_history_substring_search_match_index -eq 1 ]]; then

22
zshrc
View file

@ -49,26 +49,6 @@ export PATH=~/bin:~/util:$PATH:/usr/local/share/npm/bin
# bindkey -M menuselect ' ' accept-and-infer-next-history # bindkey -M menuselect ' ' accept-and-infer-next-history
# bindkey -M menuselect '^?' undo # bindkey -M menuselect '^?' undo
# vim mode. I'm ready for it.
bindkey -v
bindkey "^H" backward-kill-word
bindkey "^?" backward-delete-char
bindkey "^U" backward-kill-line
# must bind all kind of shit for gettind the damn control keys right now...
bindkey "^[[1;5D" backward-word
bindkey "^[[1;5C" forward-word
bindkey "^[[1;3D" vi-backward-word # alt
bindkey "^[[1;3C" vi-forward-word-end # alt
bindkey "^[[1~" beginning-of-line
bindkey "^[[4~" end-of-line
# bindkey "^[[2~" Thsi should run tmux ctrl a ] to paste copy buffer
bindkey "^[[3~" delete-char
bindkey "^[[5~" up-line-or-search
bindkey "^[[6~" down-line-or-search
bindkey -M vicmd "F10" vi-cmd-mode
# bindkey -m vicmd "F10" this should run a widget that runs tmux to switch pane (Note the semantics are reversed; by default the shell should be in insert mode)
bindkey -M viins '^r' history-incremental-search-backward
bindkey -M vicmd '^r' history-incremental-search-backward
stty -ixon stty -ixon
stty -ixoff stty -ixoff
@ -99,7 +79,7 @@ alias l="ls"
alias gs="git s" # short status alias gs="git s" # short status
alias glp="git log -p --no-ext-diff" alias glp="git log -p --no-ext-diff"
alias gdt="git difftool" alias gdt="git difftool"
alias gd="git diff --no-ext-diff" alias gd="git diff"
alias gdc="gd --cached" alias gdc="gd --cached"
alias gg="git lg" alias gg="git lg"
alias gcm="git commit -am" alias gcm="git commit -am"