From 43c8149da8c3ded080cc6444b3a3beac56e4812b Mon Sep 17 00:00:00 2001 From: Sinkerine Date: Wed, 26 Apr 2017 15:56:50 +0800 Subject: [PATCH] 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. --- plugins/tmux/tmux.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index fb514a44c..00e291abe 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -84,7 +84,7 @@ if which tmux &> /dev/null alias tmux=_zsh_tmux_plugin_run # 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 # Actually don't autostart if we already did and multiple autostarts are disabled. if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]