mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 06:58:01 +00:00
Revert "Only call reset-prompt when the appropriate zstyle is set"
This reverts commit 6d00fdf8c8
.
As unfortunate as it is, this workaround was a hack and doesn't take
into account prompts like spaceship which don't use $editor_info but
rely on $KEYMAP directly. We'll need to find a more consistent solution
to fix this.
This commit is contained in:
parent
1b441e7654
commit
054eb351f1
@ -26,8 +26,6 @@ zstyle ':prezto:module:editor' dot-expansion 'yes'
|
||||
|
||||
### PS Context
|
||||
|
||||
**NOTE:** *This is deprecated and will be removed in future versions.*
|
||||
|
||||
To enable the prompt context to be set, add the following to your
|
||||
*zpreztorc*.
|
||||
|
||||
|
@ -116,21 +116,20 @@ function editor-info {
|
||||
}
|
||||
zle -N editor-info
|
||||
|
||||
# Reset the prompt based on the current context and whether the prompt utilizes
|
||||
# the editor:info zstyle. If the prompt does utilize the editor:info, we must
|
||||
# reset the prompt, otherwise the change in the prompt will never update. If the
|
||||
# prompt does not utilize the editor:info, we simply redisplay the command line.
|
||||
# Reset the prompt based on the current context and
|
||||
# the ps-context option.
|
||||
function zle-reset-prompt {
|
||||
# Explicitly check to see if there is an editor info keymap set that would
|
||||
# require a reset of the prompt
|
||||
if zstyle -L ':prezto:module:editor:info*' | grep -v 'completing' > /dev/null 2>&1; then
|
||||
if zstyle -t ':prezto:module:editor' ps-context; then
|
||||
# If we aren't within one of the specified contexts, then we want to reset
|
||||
# the prompt with the appropriate editor_info[keymap] if there is one.
|
||||
if [[ $CONTEXT != (select|cont) ]]; then
|
||||
zle reset-prompt
|
||||
zle -R
|
||||
fi
|
||||
else
|
||||
zle reset-prompt
|
||||
zle -R
|
||||
fi
|
||||
zle -R
|
||||
}
|
||||
zle -N zle-reset-prompt
|
||||
|
||||
|
@ -36,7 +36,7 @@ function prompt_smiley_precmd {
|
||||
|
||||
function prompt_smiley_setup {
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent sp subst)
|
||||
prompt_opts=(percent subst)
|
||||
|
||||
# Add hook for calling git-info before each command.
|
||||
add-zsh-hook precmd prompt_smiley_precmd
|
||||
|
@ -62,6 +62,9 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
|
||||
# Auto convert .... to ../..
|
||||
# zstyle ':prezto:module:editor' dot-expansion 'yes'
|
||||
|
||||
# Allow the zsh prompt context to be shown.
|
||||
#zstyle ':prezto:module:editor' ps-context 'yes'
|
||||
|
||||
#
|
||||
# Git
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user