vi-mode: remove TRAPWINCH from plugin (#7753)

* Remove TRAPWINCH; it's unrelated to vi-mode

* Update prompt with ad hoc KEYMAP variable
  Fixes mode indicator when the terminal window is resized
This commit is contained in:
Roman Perepelitsa 2019-04-09 23:10:13 +02:00 committed by Marc Cornellà
parent d36c1b8d22
commit 8d7ce18e12

View file

@ -1,14 +1,12 @@
# Updates editor information when the keymap changes. # Updates editor information when the keymap changes.
function zle-keymap-select() { function zle-keymap-select() {
# update keymap variable for the prompt
VI_KEYMAP=$KEYMAP
zle reset-prompt zle reset-prompt
zle -R zle -R
} }
# Ensure that the prompt is redrawn when the terminal size changes.
TRAPWINCH() {
zle && { zle -R; zle reset-prompt }
}
zle -N zle-keymap-select zle -N zle-keymap-select
zle -N edit-command-line zle -N edit-command-line
@ -42,7 +40,7 @@ if [[ "$MODE_INDICATOR" == "" ]]; then
fi fi
function vi_mode_prompt_info() { function vi_mode_prompt_info() {
echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}" echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
} }
# define right prompt, if it wasn't defined by a theme # define right prompt, if it wasn't defined by a theme