mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 04:39:26 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
2
modules/prompt/external/async
vendored
2
modules/prompt/external/async
vendored
Submodule modules/prompt/external/async updated: 5248bd85bf...58f7ba70f0
@ -47,4 +47,13 @@ function prompt_minimal_setup {
|
||||
RPROMPT=''
|
||||
}
|
||||
|
||||
function prompt_minimal_preview {
|
||||
local +h PROMPT=''
|
||||
local +h RPROMPT=''
|
||||
local +h SPROMPT=''
|
||||
|
||||
editor-info 2> /dev/null
|
||||
prompt_preview_theme 'minimal'
|
||||
}
|
||||
|
||||
prompt_minimal_setup "$@"
|
||||
|
@ -144,16 +144,17 @@ function prompt_sorin_setup {
|
||||
zstyle ':prezto:module:git:info:keys' format \
|
||||
'status' '%b %p %c:%s%A%B%S%a%d%m%r%U%u'
|
||||
|
||||
# Set python-info parameters.
|
||||
zstyle ':prezto:module:python:info:virtualenv' format '%f%F{3}(%v)%F{7} '
|
||||
|
||||
# Set up non-zero return value display
|
||||
local show_return="✘ "
|
||||
# Default is to show the return value
|
||||
if zstyle -T ':prezto:module:prompt' show-return-val; then
|
||||
show_return+='%? '
|
||||
fi
|
||||
# Set python-info format
|
||||
zstyle ':prezto:module:python:info:virtualenv' format '%f%F{3}(%v)%F{7} '
|
||||
|
||||
# Get the async worker set up
|
||||
# Get the async worker set up.
|
||||
_sorin_cur_git_root=''
|
||||
|
||||
_prompt_sorin_git=''
|
||||
|
@ -72,6 +72,9 @@ function prompt_steeef_setup {
|
||||
local unstaged_format="${_prompt_steeef_colors[2]}●%f"
|
||||
local staged_format="${_prompt_steeef_colors[5]}●%f"
|
||||
|
||||
# Set editor-info parameters.
|
||||
zstyle ':prezto:module:editor:info:keymap:primary' format '$'
|
||||
|
||||
# Set vcs_info parameters.
|
||||
zstyle ':vcs_info:*' enable bzr git hg svn
|
||||
zstyle ':vcs_info:*:prompt:*' check-for-changes true
|
||||
@ -87,8 +90,17 @@ function prompt_steeef_setup {
|
||||
# Define prompts.
|
||||
PROMPT="
|
||||
${_prompt_steeef_colors[3]}%n%f at ${_prompt_steeef_colors[2]}%m%f in ${_prompt_steeef_colors[5]}%~%f "'${vcs_info_msg_0_}'"
|
||||
"'$python_info[virtualenv]'"$ "
|
||||
"'$python_info[virtualenv]${editor_info[keymap]} '
|
||||
RPROMPT=''
|
||||
}
|
||||
|
||||
function prompt_steeef_preview {
|
||||
local +h PROMPT=''
|
||||
local +h RPROMPT=''
|
||||
local +h SPROMPT=''
|
||||
|
||||
editor-info 2> /dev/null
|
||||
prompt_preview_theme 'steeef'
|
||||
}
|
||||
|
||||
prompt_steeef_setup "$@"
|
||||
|
Reference in New Issue
Block a user