Merge branch 'fix-no-clients-error' into develop

This commit is contained in:
ZyX 2014-03-28 08:57:24 +04:00
commit b856fa5a82
4 changed files with 4 additions and 4 deletions

View File

@ -10,7 +10,7 @@ if test -z "${POWERLINE_COMMAND}" ; then
fi
_powerline_init_tmux_support() {
if test -n "$TMUX" && tmux source-file /dev/null &>/dev/null ; then
if test -n "$TMUX" && tmux refresh -S &>/dev/null ; then
# TMUX variable may be unset to create new tmux session inside this one
_POWERLINE_TMUX="$TMUX"

View File

@ -21,7 +21,7 @@ function powerline-setup
end
_powerline_update
if test -n "$TMUX"
if tmux source-file /dev/null ^/dev/null
if tmux refresh -S ^/dev/null
function _powerline_tmux_setenv
tmux setenv -g TMUX_$argv[1]_(tmux display -p "#D" | tr -d "%") "$argv[2]"
tmux refresh -S

View File

@ -14,7 +14,7 @@ if ! $?POWERLINE_COMMAND then
setenv POWERLINE_COMMAND $POWERLINE_SOURCED:h:h:h:h:q/scripts/powerline
endif
endif
alias _powerline_tmux_set_pwd 'if ( $?TMUX && { tmux source-file /dev/null >&/dev/null } ) tmux setenv -g TMUX_PWD_`tmux display -p "#D" | tr -d %` $PWD:q ; if ( $?TMUX && { tmux source-file /dev/null >&/dev/null } ) tmux refresh -S'
alias _powerline_tmux_set_pwd 'if ( $?TMUX && { tmux refresh -S >&/dev/null } ) tmux setenv -g TMUX_PWD_`tmux display -p "#D" | tr -d %` $PWD:q ; if ( $?TMUX ) tmux refresh -S >&/dev/null'
alias _powerline_set_prompt 'set prompt="`$POWERLINE_COMMAND shell left -r tcsh_prompt --last_exit_code=$?`"'
alias _powerline_set_rprompt 'set rprompt="`$POWERLINE_COMMAND shell right -r tcsh_prompt --last_exit_code=$?` "'
alias cwdcmd "`alias cwdcmd` ; _powerline_tmux_set_pwd"

View File

@ -12,7 +12,7 @@ integer _POWERLINE_JOBNUM
_powerline_init_tmux_support() {
emulate -L zsh
if test -n "$TMUX" && tmux source-file /dev/null &>/dev/null ; then
if test -n "$TMUX" && tmux refresh -S &>/dev/null ; then
# TMUX variable may be unset to create new tmux session inside this one
typeset -g _POWERLINE_TMUX="$TMUX"