Browse Source

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

master
Sorin Ionescu 11 years ago
parent
commit
875ce2e56c
  1. 6
      modules/editor/README.md
  2. 10
      modules/editor/init.zsh
  3. 2
      runcoms/zpreztorc

6
modules/editor/README.md

@ -8,10 +8,10 @@ Settings @@ -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

10
modules/editor/init.zsh

@ -306,14 +306,14 @@ fi @@ -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}

2
runcoms/zpreztorc

@ -39,7 +39,7 @@ zstyle ':prezto:load' pmodule \ @@ -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'

Loading…
Cancel
Save