[zsh] Fix multiline prompt issue with 'zle reset-prompt' (#1397)

Close #867 
Close #1256
This commit is contained in:
Paul Frybarger 2018-10-05 03:56:26 +02:00 committed by Junegunn Choi
parent 0e06e298d4
commit fd8d371ac7
2 changed files with 5 additions and 11 deletions

View File

@ -60,8 +60,7 @@ __fzf_generic_path_completion() {
if [ -n "$matches" ]; then
LBUFFER="$lbuf$matches$tail"
fi
zle redisplay
typeset -f zle-line-init >/dev/null && zle zle-line-init
zle reset-prompt
break
fi
dir=$(dirname "$dir")
@ -100,8 +99,7 @@ _fzf_complete() {
if [ -n "$matches" ]; then
LBUFFER="$lbuf$matches"
fi
zle redisplay
typeset -f zle-line-init >/dev/null && zle zle-line-init
zle reset-prompt
command rm -f "$fifo"
}
@ -165,8 +163,7 @@ fzf-completion() {
if [ -n "$matches" ]; then
LBUFFER="$LBUFFER$matches"
fi
zle redisplay
typeset -f zle-line-init >/dev/null && zle zle-line-init
zle reset-prompt
# Trigger sequence given
elif [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir})

View File

@ -29,8 +29,7 @@ __fzfcmd() {
fzf-file-widget() {
LBUFFER="${LBUFFER}$(__fsel)"
local ret=$?
zle redisplay
typeset -f zle-line-init >/dev/null && zle zle-line-init
zle reset-prompt
return $ret
}
zle -N fzf-file-widget
@ -59,7 +58,6 @@ fzf-cd-widget() {
cd "$dir"
local ret=$?
zle fzf-redraw-prompt
typeset -f zle-line-init >/dev/null && zle zle-line-init
return $ret
}
zle -N fzf-cd-widget
@ -78,8 +76,7 @@ fzf-history-widget() {
zle vi-fetch-history -n $num
fi
fi
zle redisplay
typeset -f zle-line-init >/dev/null && zle zle-line-init
zle reset-prompt
return $ret
}
zle -N fzf-history-widget