From 875ce2e56c604bca02c51ab708b87b3d6db7efca Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sat, 18 May 2013 19:23:03 -0400
Subject: [PATCH] [Fix #434] Correct ambiguity in the use of the term keymap

---
 modules/editor/README.md |  6 +++---
 modules/editor/init.zsh  | 10 +++++-----
 runcoms/zpreztorc        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/editor/README.md b/modules/editor/README.md
index 03bc02f..d989e35 100644
--- a/modules/editor/README.md
+++ b/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
 
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
index 4838ba7..0fe9885 100644
--- a/modules/editor/init.zsh
+++ b/modules/editor/init.zsh
@@ -306,14 +306,14 @@ 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}
 
diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index 5eca1a0..34ad0d8 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -39,7 +39,7 @@ zstyle ':prezto:load' pmodule \
 #
 
 # Set the key mapping style to 'emacs' or 'vi'.
-zstyle ':prezto:module:editor' keymap 'emacs'
+zstyle ':prezto:module:editor' key-bindings 'emacs'
 
 # Auto convert .... to ../..
 # zstyle ':prezto:module:editor' dot-expansion 'yes'