Merge remote-tracking branch 'origin/master' into phoenix

Conflicts:
	.emacs.d/site-lisp/oni.el
	.xinitrc
	.zprofile

1 files changed, 8 insertions, 3 deletions

diff --git a/.zprofile b/.zprofile
index 0da982a..5d4d30e 100644
--- a/.zprofile
+++ b/.zprofile
@@ -3,6 +3,11 @@ export BROWSER=firefox
 export EDITOR="emacsclient -c -a emacs"
 export INFOPATH="${HOME}/documents/info:${INFOPATH}"
 
-PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
-PATH="$HOME/code/ext/emacs/trunk/lib-src:$PATH"
-export PATH="$HOME/code/ext/emacs/trunk/src:$PATH"
+PATH="${HOME}/usr/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"
+PATH="/usr/local/scwm/bin:$PATH"
+PATH="/usr/local/clfswm/bin:$PATH"
+export PATH="/usr/local/emacs/bin:$PATH"
+
+if [ -z "$SSH_AGENT_PID" ]; then
+    eval `ssh-agent`
+fi