mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-26 14:00:08 +00:00
Merge branch 'master' into reactive
This commit is contained in:
commit
32c3ad75cc
4 changed files with 8 additions and 14 deletions
|
@ -399,9 +399,6 @@
|
||||||
res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape %
|
res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape %
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Show the git commit
|
|
||||||
# res+=" (${VCS_STATUS_COMMIT:0:5})"
|
|
||||||
|
|
||||||
# ⇣42 if behind the remote.
|
# ⇣42 if behind the remote.
|
||||||
(( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}"
|
(( 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.
|
# ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
|
||||||
|
|
|
@ -392,9 +392,6 @@
|
||||||
res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape %
|
res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape %
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Show the git commit
|
|
||||||
# res+=" (${VCS_STATUS_COMMIT:0:5})"
|
|
||||||
|
|
||||||
# ⇣42 if behind the remote.
|
# ⇣42 if behind the remote.
|
||||||
(( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}"
|
(( 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.
|
# ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
|
||||||
|
|
|
@ -398,9 +398,6 @@
|
||||||
res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape %
|
res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape %
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Show the git commit
|
|
||||||
# res+=" (${VCS_STATUS_COMMIT:0:5})"
|
|
||||||
|
|
||||||
# ⇣42 if behind the remote.
|
# ⇣42 if behind the remote.
|
||||||
(( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}"
|
(( 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.
|
# ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42.
|
||||||
|
|
|
@ -4517,13 +4517,16 @@ function _p9k_on_expand() {
|
||||||
P9K_TTY=old
|
P9K_TTY=old
|
||||||
|
|
||||||
if ! zle; then
|
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
|
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_ksh_arrays )) && setopt ksh_arrays
|
||||||
(( __p9k_sh_glob )) && setopt sh_glob
|
(( __p9k_sh_glob )) && setopt sh_glob
|
||||||
print -rnP -- $ruler
|
print -rnP -- '%b%k%f%E'$ruler
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -5834,8 +5837,8 @@ _p9k_build_gap_post() {
|
||||||
local char=${_p9k_ret:- }
|
local char=${_p9k_ret:- }
|
||||||
_p9k_prompt_length $char
|
_p9k_prompt_length $char
|
||||||
if (( _p9k_ret != 1 || $#char != 1 )); then
|
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 ' '."
|
>&2 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 -- "Either change the value of %BPOWERLEVEL9K_MULTILINE_${(U)kind}_PROMPT_GAP_CHAR%b or remove it."
|
||||||
char=' '
|
char=' '
|
||||||
fi
|
fi
|
||||||
local style
|
local style
|
||||||
|
|
Loading…
Reference in a new issue