Merge b3bf0f394f into 9195b66161

modules/editor/init.zsh

@@ -322,6 +322,13 @@ bindkey -M vicmd "u" undo
 bindkey -M viins "$key_info[Control]_" undo
 bindkey -M vicmd "$key_info[Control]R" redo
 
+
+# Allow remapping of command-mode key
+zstyle -s ':prezto:module:editor' escape-remap 'escape_remap'
+if [[ ! -z "$escape_remap" ]]; then
+  bindkey -M viins "$escape_remap" vi-cmd-mode
+fi
+
 if (( $+widgets[history-incremental-pattern-search-backward] )); then
   bindkey -M vicmd "?" history-incremental-pattern-search-backward
   bindkey -M vicmd "/" history-incremental-pattern-search-forward

runcoms/zpreztorc

@@ -66,6 +66,9 @@ zstyle ':prezto:load' pmodule \
 # Set the key mapping style to 'emacs' or 'vi'.
 zstyle ':prezto:module:editor' key-bindings 'emacs'
 
+# If you prefer to have a different Escape key in 'vi' mode
+# zstyle ':prezto:module:editor' escape-remap 'jk'
+
 # Auto convert .... to ../..
 # zstyle ':prezto:module:editor' dot-expansion 'yes'