[Fix sorin-ionescu#434] Correct ambiguity in the use of the term keymap

modules/editor/README.md

@@ -8,10 +8,10 @@ Settings
 
 ### Key bindings
 
-To enable key bindings, add the following to *zpreztorc*, and replace 'map' with
-'emacs' or 'vi'.
+To enable key bindings, add the following to *zpreztorc*, and replace 'bindings'
+with 'emacs' or 'vi'.
 
-    zstyle ':prezto:module:editor' keymap 'map'
+    zstyle ':prezto:module:editor' key-bindings 'bindings'
 
 ### Dot Expansion
 

modules/editor/init.zsh

@@ -313,13 +313,13 @@ fi
 #
 
 # Set the key layout.
-zstyle -s ':prezto:module:editor' keymap 'keymap'
-if [[ "$keymap" == (emacs|) ]]; then
+zstyle -s ':prezto:module:editor' key-bindings 'key_bindings'
+if [[ "$key_bindings" == (emacs|) ]]; then
   bindkey -e
-elif [[ "$keymap" == vi ]]; then
+elif [[ "$key_bindings" == vi ]]; then
   bindkey -v
 else
-  print "prezto: invalid keymap: $keymap" >&2
+  print "prezto: editor: invalid key bindings: $key_bindings" >&2
 fi
 
-unset key{map,}
+unset key{,map,bindings}

runcoms/zpreztorc

@@ -48,7 +48,7 @@ zstyle ':prezto:load' pmodule \
 #
 
 # Set the key mapping style to 'emacs' or 'vi'.
-zstyle ':prezto:module:editor' keymap 'vi'
+zstyle ':prezto:module:editor' key-bindings 'vi'
 
 # Auto convert .... to ../..
 zstyle ':prezto:module:editor' dot-expansion 'yes'