From 8ea773582f4628b1ed7222b95463f835b684478d Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 27 Jul 2015 21:21:43 -0400
Subject: [PATCH] vi-mode: remove line-init/finish widgets that broken terminfo
 keybindings

The zle-line-init and zle-line-finish definitions here were broken with
respect to smkx/rmkx because their "if" logic had fallthrough where it shouldn't,
so the mode was left in rmkx all the time. This just removes those widgets
entirely, because they're now defined (correctly) in lib/keybindings.zsh and
not needed in plugins.
---
 plugins/vi-mode/vi-mode.plugin.zsh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 4424bb29..0e2af5dc 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -1,15 +1,5 @@
-# Ensures that $terminfo values are valid and updates editor information when
-# the keymap changes.
-function zle-keymap-select zle-line-init zle-line-finish {
-  # The terminal must be in application mode when ZLE is active for $terminfo
-  # values to be valid.
-  if (( ${+terminfo[smkx]} )); then
-    printf '%s' ${terminfo[smkx]}
-  fi
-  if (( ${+terminfo[rmkx]} )); then
-    printf '%s' ${terminfo[rmkx]}
-  fi
-
+# Updates editor information when the keymap changes.
+function zle-keymap-select() {
   zle reset-prompt
   zle -R
 }
@@ -19,8 +9,6 @@ TRAPWINCH() {
   zle && { zle reset-prompt; zle -R }
 }
 
-zle -N zle-line-init
-zle -N zle-line-finish
 zle -N zle-keymap-select
 zle -N edit-command-line