tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'disable-virtualenv-prompt' into develop

This commit is contained in:
ZyX 2014-07-10 23:40:26 +04:00
parent 0fb5405af6 ff7be9ac40
commit 2d1a964e32
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
powerline/bindings/bash/powerline.sh
View File

@ -43,6 +43,7 @@ _powerline_prompt() {
} }
_powerline_setup_prompt() { _powerline_setup_prompt() {
VIRTUAL_ENV_DISABLE_PROMPT=1
if test -z "${POWERLINE_COMMAND}" ; then if test -z "${POWERLINE_COMMAND}" ; then
if which powerline-client &>/dev/null ; then if which powerline-client &>/dev/null ; then
export POWERLINE_COMMAND=powerline-client export POWERLINE_COMMAND=powerline-client

1
powerline/bindings/zsh/powerline.zsh
View File

@ -111,6 +111,7 @@ _powerline_setup_prompt() {
fi fi
done done
precmd_functions+=( _powerline_set_jobnum ) precmd_functions+=( _powerline_set_jobnum )
VIRTUAL_ENV_DISABLE_PROMPT=1
if test -z "${POWERLINE_NO_ZSH_ZPYTHON}" && { zmodload libzpython || zmodload zsh/zpython } &>/dev/null ; then if test -z "${POWERLINE_NO_ZSH_ZPYTHON}" && { zmodload libzpython || zmodload zsh/zpython } &>/dev/null ; then
precmd_functions+=( _powerline_update_counter ) precmd_functions+=( _powerline_update_counter )
zpython 'from powerline.bindings.zsh import setup as _powerline_setup' zpython 'from powerline.bindings.zsh import setup as _powerline_setup'