adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Fix #541] Do not auto-load screen/tmux inside of Emacs/Vim

Browse Source 
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.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
This commit is contained in:
Gaelan D'costa 2014-02-17 17:57:34 -05:00 committed by Sorin Ionescu
parent 8189577772
commit e5a0e33f1c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/screen/init.zsh
View File

@ -15,7 +15,7 @@ fi
# Auto Start
#
if [[ -z "$STY" ]] && ( \
if [[ -z "$STY" && ( -n "$INSIDE_EMACS" || -n "$EMACS" || -n "$VIM" ) ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
); then

2
modules/tmux/init.zsh
View File

@ -16,7 +16,7 @@ fi
# Auto Start
#
if [[ -z "$TMUX" ]] && ( \
if [[ -z "$TMUX" && ( -n "$INSIDE_EMACS" || -n "$EMACS" || -n "$VIM" ) ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
); then