diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-11-05 15:09:51 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-11-05 15:09:51 +0300 |
| commit | 8231995ed55640d994eeb97f79b1dae363fedda1 (patch) | |
| tree | 5c18bed97482e65679e15f4a61b8ccb537949c45 /internal | |
| parent | d4265ab2794145d6550ab6c877f3aef5319bbf58 (diff) | |
| parent | 4586e8d54c40fb6bd688128101ea5c853e34773b (diff) | |
Merge branch 'master' into dynamic
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/p10k.zsh | 12 | ||||
| -rwxr-xr-x | internal/wizard.zsh | 11 |
2 files changed, 20 insertions, 3 deletions
diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 3d990e58..243ab560 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -3432,6 +3432,8 @@ function _p9k_set_iface() { function _p9k_build_segment() { _p9k_segment_name=${_p9k_segment_name%_joined} + local disabled=POWERLEVEL9K_${(U)_p9k_segment_name}_DISABLED_DIR_PATTERN + [[ $_p9k_pwd == ${(P)~disabled} ]] && return if [[ $_p9k_segment_name == custom_* ]]; then _p9k_custom_prompt $_p9k_segment_name[8,-1] elif (( $+functions[prompt_$_p9k_segment_name] )); then @@ -3442,6 +3444,8 @@ function _p9k_build_segment() { function _p9k_build_instant_segment() { _p9k_segment_name=${_p9k_segment_name%_joined} + local disabled=POWERLEVEL9K_${(U)_p9k_segment_name}_DISABLED_DIR_PATTERN + [[ $_p9k_pwd == ${(P)~disabled} ]] && return if (( $+functions[instant_prompt_$_p9k_segment_name] )); then local -i len=$#_p9k__prompt _p9k_non_hermetic_expansion=0 @@ -5428,7 +5432,13 @@ _p9k_init_vcs() { local daemon=${GITSTATUS_DAEMON} if [[ -z $daemon ]]; then daemon=$gitstatus_dir/bin/gitstatusd- - [[ $_p9k_uname_o == Android ]] && daemon+=android || daemon+=${_p9k_uname:l} + if [[ $_p9k_uname_o == Android ]]; then + daemon+=android + elif [[ $_p9k_uname == (MINGW_64-10.0|MSYS_NT-10.0-*) ]]; then + daemon+=msys_nt-10.0 + else + daemon+=${_p9k_uname:l} + fi daemon+=-${_p9k_uname_m:l} fi local -i threads=${GITSTATUS_NUM_THREADS:-0} diff --git a/internal/wizard.zsh b/internal/wizard.zsh index 4f11ef68..1700c898 100755 --- a/internal/wizard.zsh +++ b/internal/wizard.zsh @@ -1368,8 +1368,8 @@ function ask_zshrc_edit() { cp -p $__p9k_zshrc $zshrc_backup || quit -c print -r -- $zshrc_content >$zshrc_backup || quit -c zshrc_backup_u=${${TMPDIR:+\$TMPDIR}:-/tmp}/${(q-)zshrc_backup:t} - break fi + break ;; esac done @@ -1538,12 +1538,19 @@ function generate_config() { sub MULTILINE_FIRST_PROMPT_PREFIX '' sub MULTILINE_NEWLINE_PROMPT_PREFIX '' sub MULTILINE_LAST_PROMPT_PREFIX '' - uncomment prompt_char sub STATUS_OK false sub STATUS_ERROR false fi fi + if [[ $style == (classic|rainbow) ]]; then + if (( num_lines == 2 && ! left_frame )); then + uncomment prompt_char + else + uncomment vi_mode + fi + fi + (( empty_line )) && sub PROMPT_ADD_NEWLINE true || sub PROMPT_ADD_NEWLINE false sub INSTANT_PROMPT $instant_prompt |