mirror of
https://github.com/powerline/powerline.git
synced 2025-07-26 23:35:04 +02:00
Merge branch 'fix-no-clients-error' into develop
This commit is contained in:
commit
b856fa5a82
@ -10,7 +10,7 @@ if test -z "${POWERLINE_COMMAND}" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
_powerline_init_tmux_support() {
|
_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
|
# TMUX variable may be unset to create new tmux session inside this one
|
||||||
_POWERLINE_TMUX="$TMUX"
|
_POWERLINE_TMUX="$TMUX"
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ function powerline-setup
|
|||||||
end
|
end
|
||||||
_powerline_update
|
_powerline_update
|
||||||
if test -n "$TMUX"
|
if test -n "$TMUX"
|
||||||
if tmux source-file /dev/null ^/dev/null
|
if tmux refresh -S ^/dev/null
|
||||||
function _powerline_tmux_setenv
|
function _powerline_tmux_setenv
|
||||||
tmux setenv -g TMUX_$argv[1]_(tmux display -p "#D" | tr -d "%") "$argv[2]"
|
tmux setenv -g TMUX_$argv[1]_(tmux display -p "#D" | tr -d "%") "$argv[2]"
|
||||||
tmux refresh -S
|
tmux refresh -S
|
||||||
|
@ -14,7 +14,7 @@ if ! $?POWERLINE_COMMAND then
|
|||||||
setenv POWERLINE_COMMAND $POWERLINE_SOURCED:h:h:h:h:q/scripts/powerline
|
setenv POWERLINE_COMMAND $POWERLINE_SOURCED:h:h:h:h:q/scripts/powerline
|
||||||
endif
|
endif
|
||||||
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_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 _powerline_set_rprompt 'set rprompt="`$POWERLINE_COMMAND shell right -r tcsh_prompt --last_exit_code=$?` "'
|
||||||
alias cwdcmd "`alias cwdcmd` ; _powerline_tmux_set_pwd"
|
alias cwdcmd "`alias cwdcmd` ; _powerline_tmux_set_pwd"
|
||||||
|
@ -12,7 +12,7 @@ integer _POWERLINE_JOBNUM
|
|||||||
|
|
||||||
_powerline_init_tmux_support() {
|
_powerline_init_tmux_support() {
|
||||||
emulate -L zsh
|
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
|
# TMUX variable may be unset to create new tmux session inside this one
|
||||||
typeset -g _POWERLINE_TMUX="$TMUX"
|
typeset -g _POWERLINE_TMUX="$TMUX"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user