diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-01-13 10:51:07 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-01-13 10:51:07 +0300 |
| commit | 32c3ad75cc564b484ab81af3f00f4cbcee614148 (patch) | |
| tree | 03e745be8ee40025c9c6a00b1379d465578994b2 | |
| parent | 35d2432326505838c36b968e53dd67de85175788 (diff) | |
| parent | 2b307eefd8e2552d0fba26569fafaaf21f7ecdd0 (diff) | |
Merge branch 'master' into reactive
| -rw-r--r-- | config/p10k-classic.zsh | 3 | ||||
| -rw-r--r-- | config/p10k-lean.zsh | 3 | ||||
| -rw-r--r-- | config/p10k-rainbow.zsh | 3 | ||||
| -rw-r--r-- | internal/p10k.zsh | 13 |
4 files changed, 8 insertions, 14 deletions
diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh index a56a2684..a052dd1b 100644 --- a/config/p10k-classic.zsh +++ b/config/p10k-classic.zsh @@ -399,9 +399,6 @@ res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape % fi - # Show the git commit - # res+=" (${VCS_STATUS_COMMIT:0:5})" - # ⇣42 if behind the remote. (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh index 63aacbb0..f4fe0c6f 100644 --- a/config/p10k-lean.zsh +++ b/config/p10k-lean.zsh @@ -392,9 +392,6 @@ res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape % fi - # Show the git commit - # res+=" (${VCS_STATUS_COMMIT:0:5})" - # ⇣42 if behind the remote. (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. diff --git a/config/p10k-rainbow.zsh b/config/p10k-rainbow.zsh index 369d12d7..52c56940 100644 --- a/config/p10k-rainbow.zsh +++ b/config/p10k-rainbow.zsh @@ -398,9 +398,6 @@ res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape % fi - # Show the git commit - # res+=" (${VCS_STATUS_COMMIT:0:5})" - # ⇣42 if behind the remote. (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. diff --git a/internal/p10k.zsh b/internal/p10k.zsh index c4072d7a..68f78262 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -4517,13 +4517,16 @@ function _p9k_on_expand() { P9K_TTY=old if ! zle; then - [[ $_p9k__display_v[2] == print ]] && print -rn -- $_p9k_t[_p9k_empty_line_idx] + if [[ $_p9k__display_v[2] == print && -n $_p9k_t[_p9k_empty_line_idx] ]]; then + print -rnP -- '%b%k%f%E'$_p9k_t[_p9k_empty_line_idx] + fi if [[ $_p9k__display_v[4] == print ]]; then - local ruler=$_p9k_t[_p9k_ruler_idx] () { + local ruler=$_p9k_t[_p9k_ruler_idx] + local -i _p9k_clm=COLUMNS _p9k_ind=${ZLE_RPROMPT_INDENT:-1} (( __p9k_ksh_arrays )) && setopt ksh_arrays (( __p9k_sh_glob )) && setopt sh_glob - print -rnP -- $ruler + print -rnP -- '%b%k%f%E'$ruler } fi fi @@ -5834,8 +5837,8 @@ _p9k_build_gap_post() { local char=${_p9k_ret:- } _p9k_prompt_length $char if (( _p9k_ret != 1 || $#char != 1 )); then - print -rP -- "%F{red}WARNING!%f %BMULTILINE_${(U)kind}_PROMPT_GAP_CHAR%b is not one character long. Will use ' '." - print -rP -- "Either change the value of %BPOWERLEVEL9K_MULTILINE_${(U)kind}_PROMPT_GAP_CHAR%b or remove it." + >&2 print -rP -- "%F{red}WARNING!%f %BMULTILINE_${(U)kind}_PROMPT_GAP_CHAR%b is not one character long. Will use ' '." + >&2 print -rP -- "Either change the value of %BPOWERLEVEL9K_MULTILINE_${(U)kind}_PROMPT_GAP_CHAR%b or remove it." char=' ' fi local style |