From 10cf7018645fd9c09a0aa03c4ebac5ae6222c77e Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Wed, 26 Feb 2014 17:19:19 -0500 Subject: [PATCH] Simplify multiplexer auto-start tests --- modules/screen/init.zsh | 2 +- modules/tmux/init.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/screen/init.zsh b/modules/screen/init.zsh index a9a09682..7a5cee3d 100644 --- a/modules/screen/init.zsh +++ b/modules/screen/init.zsh @@ -15,7 +15,7 @@ fi # Auto Start # -if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \ +if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \ ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) || ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \ ); then diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh index f7f4c7ed..bee24e4c 100644 --- a/modules/tmux/init.zsh +++ b/modules/tmux/init.zsh @@ -16,7 +16,7 @@ fi # Auto Start # -if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \ +if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \ ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) || ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \ ); then