1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-01-06 20:26:47 +00:00

Merge upstream/master

This commit is contained in:
Daniel Carrillo 2024-12-27 17:45:48 +01:00
commit e04b99d9a5
4 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
Subproject commit e52ee8ca55bcc56a17c828767a3f98f22a68d4eb

@ -1 +1 @@
Subproject commit 978e79e12c44b5b1d3e1e2920c537002087b82c2
Subproject commit c160d09fddd28ceb3af5cf80e9253af80e450d96

@ -1 +1 @@
Subproject commit 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64
Subproject commit 87ce96b1862928d84b1afe7c173316614b30e301

View File

@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
_tmux_iterm_integration='-CC'
fi
if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$VSCODE_RESOLVING_ENVIRONMENT" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
); then