psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-23 07:45:34 -05:00
Code Issues Releases Wiki Activity

Fixes to Git coloring and stopped Coloring Leak

Browse source
This commit is contained in:
AtomicCoding 2018-03-31 11:02:01 -07:00
parent 5759379e67
commit 41d6ff3a5b
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/prompt/functions/prompt_sorin_setup
View file

@ -29,10 +29,6 @@
# 15 bright white # 15 bright white
# #
function prompt_sorin_git {
cd -q "$1"
echo $(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/')
}
function prompt-pwd { function prompt-pwd {
setopt localoptions extendedglob setopt localoptions extendedglob
@ -69,7 +65,7 @@ function prompt_sorin_precmd {
if (( $+functions[git-dir] )); then if (( $+functions[git-dir] )); then
local new_git_root="$(git-dir 2> /dev/null)" local new_git_root="$(git-dir 2> /dev/null)"
if [[ $new_git_root != $_sorin_cur_git_root ]]; then if [[ $new_git_root != $_sorin_cur_git_root ]]; then
_prompt_sorin_git$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/') _prompt_sorin_git=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/')
_sorin_cur_git_root=$new_git_root _sorin_cur_git_root=$new_git_root
fi fi
fi fi
@ -98,10 +94,10 @@ function prompt_sorin_setup {
_prompt_sorin_git='' _prompt_sorin_git=''
_prompt_sorin_pwd='' _prompt_sorin_pwd=''
# Define prompts. # Define prompts.
PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{10}> ' PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} %F{9}>%F{3}>%F{2}>%f '
RPROMPT='$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}' RPROMPT='$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}'
RPROMPT+=${show_return} RPROMPT+=${show_return}
RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}${_prompt_sorin_git}' RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}%F{4}${_prompt_sorin_git}%f'
# SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? ' # SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? '
} }