[Fix #516] Define ZLE functions separately

modules/editor/init.zsh

@@ -107,30 +107,39 @@ function editor-info {
 }
 zle -N editor-info
 
-# Ensures that $terminfo values are valid and updates editor information when
+# Updates editor information when the keymap changes.
-# the keymap changes.
+function zle-keymap-select {
-function zle-keymap-select zle-line-init zle-line-finish {
+  zle editor-info
+}
+zle -N zle-keymap-select
+
+# Enables terminal application mode and updates editor information.
+function zle-line-init {
   # The terminal must be in application mode when ZLE is active for $terminfo
   # values to be valid.
-  if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
+  if (( $+terminfo[smkx] )); then
-    case "$0" in
-      (zle-line-init)
     # Enable terminal application mode.
     echoti smkx
-      ;;
+  fi
-      (zle-line-finish)
+
+  # Update editor information.
+  zle editor-info
+}
+zle -N zle-line-init
+
+# Disables terminal application mode and updates editor information.
+function zle-line-finish {
+  # The terminal must be in application mode when ZLE is active for $terminfo
+  # values to be valid.
+  if (( $+terminfo[rmkx] )); then
     # Disable terminal application mode.
     echoti rmkx
-      ;;
-    esac
   fi
 
   # Update editor information.
   zle editor-info
 }
-zle -N zle-keymap-select
 zle -N zle-line-finish
-zle -N zle-line-init
 
 # Toggles emacs overwrite mode and updates editor information.
 function overwrite-mode {