diff --git a/.zshenv b/.zshenv
index 33f7d2a..5b25215 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,3 +1,4 @@
+# -*- eval: (git-auto-commit-mode 1) -*-
 LESSCMD="less -FXRS"
 
 export LESS_TERMCAP_mb=$'\e[1;37m'
@@ -10,6 +11,7 @@ export LESS_TERMCAP_us=$'\e[0;36m'
 
 export BROWSER=firefox
 export PAGER=$LESSCMD
+export EDITOR="emacsclient -c"
 
 # Aliases
 alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc"""
@@ -19,4 +21,3 @@ alias grep="grep --color=always"
 alias less=$LESSCMD
 alias ls="ls -F --color=always"
 alias mysql="mysql --pager"
-alias slrn="NNTPSERVER='news.gmane.org' slrn"