linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/tmux/tmux.plugin.zsh
This commit is contained in:
Andrew Schwartzmeyer 2013-09-15 18:42:07 -07:00
commit 56cd862c2c
8 changed files with 106 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/tmux/tmux.plugin.zsh
View file

@ -38,7 +38,7 @@ if which tmux &> /dev/null
fi
# Set the correct local config file to use.
if [[ -a $HOME/.tmux.conf && "$ZSH_TMUX_ITERM2" == "false" ]]
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"