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

vi-mode: remove TRAPWINCH from plugin (#7753)
8d7ce18e · Roman Perepelitsa · Marc Cornellà · d36c1b8d · 8d7ce18e
Commit 8d7ce18e authored Apr 09, 2019 by Roman Perepelitsa Committed by Marc Cornellà Apr 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

vi-mode.plugin.zsh plugins/vi-mode/vi-mode.plugin.zsh +4 -6

No files found.
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
 # 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