Skip to content

Commit

Permalink
vi-mode: remove TRAPWINCH from plugin (#7753)
Browse files Browse the repository at this point in the history
* Remove TRAPWINCH; it's unrelated to vi-mode

* Update prompt with ad hoc KEYMAP variable
  Fixes mode indicator when the terminal window is resized
  • Loading branch information
romkatv authored and crdant committed Dec 30, 2020
1 parent c556f4c commit a86ca19
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions plugins/vi-mode/vi-mode.plugin.zsh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a86ca19

Please sign in to comment.