diff options
| author | yleo77 <ylep77@gmail.com> | 2013-07-16 16:37:18 +0800 |
|---|---|---|
| committer | yleo77 <ylep77@gmail.com> | 2013-07-16 16:37:18 +0800 |
| commit | 67b2781f6200a0dff35055eb67937a0df2be2c51 (patch) | |
| tree | 73b692f4146042966f7d2fed10ab88946cbc077b /plugins/tmux | |
| parent | 6b832b93588567cb00b9a9e8170a5ebf539dea51 (diff) | |
| parent | 7f74294d7aa7ab86e18e70a1153c15fa373c5849 (diff) | |
| download | zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.tar.gz zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.tar.bz2 zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.zip | |
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'plugins/tmux')
| -rw-r--r-- | plugins/tmux/tmux.plugin.zsh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index 465f5b053..3ecc2ac69 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -14,6 +14,8 @@ if which tmux &> /dev/null [[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART # Set term to screen or screen-256color based on current terminal support [[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true + # Set '-CC' option for iTerm2 tmux integration + [[ -n "$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false # The TERM to use for non-256 color terminals. # Tmux states this should be screen, but you may need to change it on # systems without the proper terminfo @@ -36,7 +38,7 @@ if which tmux &> /dev/null fi # Set the correct local config file to use. - if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]] + if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -f $HOME/.tmux.conf ]] || -h $HOME/.tmux.conf ]] )) then #use this when they have a ~/.tmux.conf export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf" @@ -55,11 +57,11 @@ if which tmux &> /dev/null # Try to connect to an existing session. elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] then - \tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session + \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` attach || \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit # Just run tmux, fixing the TERM variable if requested. else - \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` + \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit fi } |