diff options
| author | Aaron N. Brock <AaronNBrock@gmail.com> | 2019-11-22 10:40:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 10:40:37 -0500 |
| commit | 420e9d789a26223df9dd7df7625daf032a3f5083 (patch) | |
| tree | 0ccfcd55671fd4d68b61a91188c984563384ee30 /plugins/tmux | |
| parent | 5722677884e85ae910daab4b4624745af74540e6 (diff) | |
| parent | 76d6b0256398ad1becbc304a78f51bbacfee50e5 (diff) | |
| download | zsh-420e9d789a26223df9dd7df7625daf032a3f5083.tar.gz zsh-420e9d789a26223df9dd7df7625daf032a3f5083.tar.bz2 zsh-420e9d789a26223df9dd7df7625daf032a3f5083.zip | |
Merge branch 'master' into colorize-chroma-support
Diffstat (limited to 'plugins/tmux')
| -rw-r--r-- | plugins/tmux/tmux.plugin.zsh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index 5b5d1b1ba..dad3db578 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -46,6 +46,7 @@ fi # Set the correct local config file to use. if [[ "$ZSH_TMUX_ITERM2" == "false" && -e "$ZSH_TMUX_CONFIG" ]]; then + export ZSH_TMUX_CONFIG export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.extra.conf" else export _ZSH_TMUX_FIXED_CONFIG="${0:h:a}/tmux.only.conf" |