From 6d5650eae78ca05256e4bad5e66b47aec1758b40 Mon Sep 17 00:00:00 2001 From: Manoel Vilela Date: Sat, 14 Oct 2017 06:50:50 -0300 Subject: [PATCH] [tmux] Avoid run tmux when the shell is executed on emacs This avoid weird bugs to try running zsh through C-x M-x and bug happens because obviously tmux is not designed to be executed inside emacs. --- modules/tmux/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh index 720fb04..a361a6a 100644 --- a/modules/tmux/init.zsh +++ b/modules/tmux/init.zsh @@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \ _tmux_iterm_integration='-CC' fi -if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \ +if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" ]] && ( \ ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) || ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \ ); then