Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -15,11 +15,23 @@
 LS_COLORS='di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.rar=36:*.xz=36:*.zip=36:*.orig=90:*~=90'
 FEMALE="no"	# Whether the user is female ;)
 LISTMAX=32768
 WORDCHARS="*?[];!#~"
 
-bindkey -e
+bindkey -v
+# history-incremental-search-backward is much more useful than
+# _history-complete-*
+bindkey "^R" history-incremental-search-backward
+# Add a few other emacs bindings for convenience, as it's sometimes quicker to
+# use those than to switch between modes.
+bindkey "^A" beginning-of-line
+bindkey "^E" end-of-line
+bindkey "^D" delete-char-or-list
+# backward-kill-word behaves more like vim, whereas vi-backward-kill-word is
+# the vi behaviour.
+bindkey "^W" backward-kill-word
+
 setopt no_bg_nice
 setopt no_nomatch
 setopt extended_glob
 setopt autocd
 setopt auto_pushd