Fix for tmux plugin: Do not auto-load tmux inside of Emacs/Vim

When Emacs and Vim are launched from outside of an interactive shell,
$TMUX and $STY are not set; check for Emacs and Vim environment
variables instead.
This commit is contained in:
Sinkerine 2017-04-26 15:56:50 +08:00
commit 43c8149da8

View file

@ -84,7 +84,7 @@ if which tmux &> /dev/null
alias tmux=_zsh_tmux_plugin_run alias tmux=_zsh_tmux_plugin_run
# Autostart if not already in tmux and enabled. # Autostart if not already in tmux and enabled.
if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]] if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && ( -n "$INSIDE_EMACS" || -n "$EMACS" || -n "$VIM" ) ]]
then then
# Actually don't autostart if we already did and multiple autostarts are disabled. # Actually don't autostart if we already did and multiple autostarts are disabled.
if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]] if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]