diff --git a/.exports b/.exports
index 1c15ac72..41d53f35 100644
--- a/.exports
+++ b/.exports
@@ -1,3 +1,7 @@
+# Make emacs the default editor.
+export EDITOR=`which emacs`
+export VISUAL=`which emacs`
+
 # Larger bash history (allow 32³ entries; default is 500)
 export HISTSIZE=32768
 export HISTFILESIZE=$HISTSIZE
diff --git a/oh-my-zsh b/oh-my-zsh
index bbe8b9f3..5cb255af 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit bbe8b9f384166d6d8ce0e8ffe1d78fa972daff3b
+Subproject commit 5cb255afe3f42b713a70ecbb124681612a3a0923