dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 19:48:00 +00:00
Code Issues Releases Wiki Activity

Revert "Only call reset-prompt when the appropriate zstyle is set"

Browse Source 
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:
Kaleb Elwert 2018-04-06 11:33:02 -07:00
parent 1b441e7654
commit 054eb351f1
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/editor/README.md
View File

@ -26,8 +26,6 @@ zstyle ':prezto:module:editor' dot-expansion 'yes'
### PS Context ### 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 To enable the prompt context to be set, add the following to your
*zpreztorc*. *zpreztorc*.

17
modules/editor/init.zsh
View File

@ -116,21 +116,20 @@ function editor-info {
} }
zle -N editor-info zle -N editor-info
# Reset the prompt based on the current context and whether the prompt utilizes # Reset the prompt based on the current context and
# the editor:info zstyle. If the prompt does utilize the editor:info, we must # the ps-context option.
# 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.
function zle-reset-prompt { function zle-reset-prompt {
# Explicitly check to see if there is an editor info keymap set that would if zstyle -t ':prezto:module:editor' ps-context; then
# require a reset of the prompt
if zstyle -L ':prezto:module:editor:info*' | grep -v 'completing' > /dev/null 2>&1; then
# If we aren't within one of the specified contexts, then we want to reset # 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. # the prompt with the appropriate editor_info[keymap] if there is one.
if [[ $CONTEXT != (select|cont) ]]; then if [[ $CONTEXT != (select|cont) ]]; then
zle reset-prompt zle reset-prompt
fi
fi
zle -R zle -R
fi
else
zle reset-prompt
zle -R
fi
} }
zle -N zle-reset-prompt zle -N zle-reset-prompt

2
modules/prompt/functions/prompt_smiley_setup
View File

@ -36,7 +36,7 @@ function prompt_smiley_precmd {
function prompt_smiley_setup { function prompt_smiley_setup {
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent sp subst) prompt_opts=(percent subst)
# Add hook for calling git-info before each command. # Add hook for calling git-info before each command.
add-zsh-hook precmd prompt_smiley_precmd add-zsh-hook precmd prompt_smiley_precmd

3
runcoms/zpreztorc
View File

@ -62,6 +62,9 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
# Auto convert .... to ../.. # Auto convert .... to ../..
# zstyle ':prezto:module:editor' dot-expansion 'yes' # zstyle ':prezto:module:editor' dot-expansion 'yes'
# Allow the zsh prompt context to be shown.
#zstyle ':prezto:module:editor' ps-context 'yes'
# #
# Git # Git
# #