Skip to content

Commit 779130e

Browse files
committed
Prefer USR1 async method to all others
1 parent b493b7d commit 779130e

File tree

1 file changed

+5
-29
lines changed

1 file changed

+5
-29
lines changed

agkozak-zsh-prompt.plugin.zsh

+5-29
Original file line numberDiff line numberDiff line change
@@ -598,39 +598,15 @@ _agkozak_async_init() {
598598
emulate -L zsh
599599
setopt LOCAL_OPTIONS NO_LOCAL_TRAPS
600600

601-
# Detect WSL1
602-
if [[ $OSTYPE == linux* &&
603-
-r /proc/version &&
604-
$(< /proc/version) == *Microsoft* ]]; then
605-
# Early versions of WSL1 require BG_NICE to be explicitly disabled
606-
unsetopt BG_NICE
607-
AGKOZAK[IS_WSL1]=1
608-
fi
609-
610601
if [[ $AGKOZAK_FORCE_ASYNC_METHOD == (subst-async|zsh-async|usr1|none) ]]; then
611602
[[ $AGKOZAK_FORCE_ASYNC_METHOD == 'zsh-async' ]] && _agkozak_load_async_lib
612603
AGKOZAK[ASYNC_METHOD]=$AGKOZAK_FORCE_ASYNC_METHOD
613-
614-
# Otherwise, first provide for certain quirky systems
604+
elif [[ $TERM == 'dumb' ]]; then
605+
AGKOZAK[ASYNC_METHOD]='none'
606+
elif _agkozak_has_usr1; then
607+
AGKOZAK[ASYNC_METHOD]='usr1'
615608
else
616-
617-
# SIGUSR1 method is still much faster on Windows (MSYS2/Cygwin/WSL1).
618-
if [[ $OSTYPE == (msys|cygwin) ]] || (( AGKOZAK[IS_WSL1] )); then
619-
if _agkozak_has_usr1; then
620-
AGKOZAK[ASYNC_METHOD]='usr1'
621-
else
622-
AGKOZAK[ASYNC_METHOD]='subst-async'
623-
fi
624-
625-
# Asynchronous methods don't work in Emacs shell mode (but they do in term
626-
# and ansi-term)
627-
elif [[ $TERM == 'dumb' ]]; then
628-
AGKOZAK[ASYNC_METHOD]='none'
629-
630-
# Otherwise use subst-async
631-
else
632-
AGKOZAK[ASYNC_METHOD]='subst-async'
633-
fi
609+
AGKOZAK[ASYNC_METHOD]='subst-async'
634610
fi
635611

636612
############################################################

0 commit comments

Comments
 (0)