diff options
| author | yleo77 <ylep77@gmail.com> | 2013-09-19 12:40:45 +0800 |
|---|---|---|
| committer | yleo77 <ylep77@gmail.com> | 2013-09-19 12:40:45 +0800 |
| commit | 0240ac6496fc01b287caaab1a62cd760590144be (patch) | |
| tree | 120cbd08b851e012d8843652ccf8bf89c5a023f7 /plugins/tmux | |
| parent | fda5afaebca57250792696e29c2e111f41f6fce4 (diff) | |
| parent | b51c2a0d0b0af68d4b2b70b922f7d56a14a23dcc (diff) | |
| download | zsh-0240ac6496fc01b287caaab1a62cd760590144be.tar.gz zsh-0240ac6496fc01b287caaab1a62cd760590144be.tar.bz2 zsh-0240ac6496fc01b287caaab1a62cd760590144be.zip | |
Merge remote-tracking branch 'robbyrussell/master'
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 3ecc2ac69..96fab80a6 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 [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -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" |