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/wizard.zsh | |
| parent | d4265ab2794145d6550ab6c877f3aef5319bbf58 (diff) | |
| parent | 4586e8d54c40fb6bd688128101ea5c853e34773b (diff) | |
Merge branch 'master' into dynamic
Diffstat (limited to 'internal/wizard.zsh')
| -rwxr-xr-x | internal/wizard.zsh | 11 |
1 files changed, 9 insertions, 2 deletions
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 |