diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-05-19 11:10:43 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-05-19 11:10:43 +0300 |
| commit | e3beeea0ae8e2fdc5d997edeed4ffc3870b49bae (patch) | |
| tree | 6d0eeeb68d5298793e0251490be872c6096488eb /internal | |
| parent | c0ff47bea59d58b027d546546509461812ae4cae (diff) | |
block SIGINT in nested p10k calls; allow SIGINT in gitstatus_start
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/p10k.zsh | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 5a980a3e..025da391 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -1,4 +1,4 @@ -if [[ $__p9k_sourced != 11 ]]; then +if [[ $__p9k_sourced != 12 ]]; then >&2 print -P "" >&2 print -P "[%F{1}ERROR%f]: Corrupted powerlevel10k installation." >&2 print -P "" @@ -7882,7 +7882,16 @@ _p9k_init_vcs() { _p9k_segment_in_use vcs || return _p9k_vcs_info_init if (( $+functions[_p9k_preinit] )); then - (( $+GITSTATUS_DAEMON_PID_POWERLEVEL9K )) && gitstatus_start_p9k_ POWERLEVEL9K + if (( $+GITSTATUS_DAEMON_PID_POWERLEVEL9K )); then + () { + trap 'return 130' INT + { + gitstatus_start_p9k_ POWERLEVEL9K + } always { + trap ':' INT + } + } + fi return 0 fi (( _POWERLEVEL9K_DISABLE_GITSTATUS )) && return @@ -7910,14 +7919,21 @@ _p9k_init_vcs() { -a POWERLEVEL9K }" source $gitstatus_dir/gitstatus.plugin.zsh _p9k_ || return - gitstatus_start_p9k_ \ - -s $_POWERLEVEL9K_VCS_STAGED_MAX_NUM \ - -u $_POWERLEVEL9K_VCS_UNSTAGED_MAX_NUM \ - -d $_POWERLEVEL9K_VCS_UNTRACKED_MAX_NUM \ - -c $_POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM \ - -m $_POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY \ - ${${_POWERLEVEL9K_VCS_RECURSE_UNTRACKED_DIRS:#0}:+-e} \ - POWERLEVEL9K + () { + trap 'return 130' INT + { + gitstatus_start_p9k_ \ + -s $_POWERLEVEL9K_VCS_STAGED_MAX_NUM \ + -u $_POWERLEVEL9K_VCS_UNSTAGED_MAX_NUM \ + -d $_POWERLEVEL9K_VCS_UNTRACKED_MAX_NUM \ + -c $_POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM \ + -m $_POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY \ + ${${_POWERLEVEL9K_VCS_RECURSE_UNTRACKED_DIRS:#0}:+-e} \ + POWERLEVEL9K + } always { + trap ':' INT + } + } } _p9k_init() { |