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

main
Sorin Ionescu 12 years ago
parent 16aa48baeb
commit 875ce2e56c

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

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

@ -39,7 +39,7 @@ zstyle ':prezto:load' pmodule \
# #
# Set the key mapping style to 'emacs' or 'vi'. # 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 ../.. # Auto convert .... to ../..
# zstyle ':prezto:module:editor' dot-expansion 'yes' # zstyle ':prezto:module:editor' dot-expansion 'yes'

Loading…
Cancel
Save