From 8d7ce18e121b4fd2768906840cd5d38e5ecc148c Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Tue, 9 Apr 2019 23:10:13 +0200 Subject: [PATCH] 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 --- plugins/vi-mode/vi-mode.plugin.zsh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index c1cdd2851..a82e41439 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -1,14 +1,12 @@ # Updates editor information when the keymap changes. function zle-keymap-select() { + # update keymap variable for the prompt + VI_KEYMAP=$KEYMAP + zle reset-prompt 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 edit-command-line @@ -42,7 +40,7 @@ if [[ "$MODE_INDICATOR" == "" ]]; then fi 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