Merge commit 'e1322f2' into larry

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 120a2402cd7c90f44f08ed834cb9b61e539a0da1..26e14ca0e8d6e6213283df5aa673275876bb6826 100755 (executable)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -27,7 +27,7 @@ WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
 #Allow bash-style comments
 setopt interactivecomments
 
-export EDITOR='nano'
+export EDITOR='vim'
 
 # Timestamp in history command ("mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd")
 HIST_STAMPS="dd.mm.yyyy"