diff options
| author | Andrew Schwartzmeyer <andrew.schwartzmeyer@gmail.com> | 2013-06-22 17:43:42 -0700 |
|---|---|---|
| committer | Andrew Schwartzmeyer <andrew.schwartzmeyer@gmail.com> | 2013-06-22 18:20:11 -0700 |
| commit | 55f7990607ae413ae9f1edacf94f9c6369456983 (patch) | |
| tree | 90c60c655b7f81da2303596271291df8a17f06fa /plugins/tmux | |
| parent | bc65443734ec96ddc8da61c022d630fa8303765a (diff) | |
| download | zsh-55f7990607ae413ae9f1edacf94f9c6369456983.tar.gz zsh-55f7990607ae413ae9f1edacf94f9c6369456983.tar.bz2 zsh-55f7990607ae413ae9f1edacf94f9c6369456983.zip | |
Not loading home tmux confs when iTerm2 tmux integration is enabled
Diffstat (limited to 'plugins/tmux')
| -rw-r--r-- | plugins/tmux/tmux.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index 5bd946f08..049ceb30f 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -38,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" |