diff options
author | Tom Willemsen | 2012-10-24 01:36:38 +0200 |
---|---|---|
committer | Tom Willemsen | 2012-10-24 01:36:38 +0200 |
commit | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (patch) | |
tree | 71f06d73cb4139e6a8c8aff91e229a9ff4d58b35 /.zprofile | |
parent | ab3e4c680e329db4c01e6d029874124011328ba1 (diff) | |
parent | 31d3b87a976a229f444251b871c32dd914330044 (diff) | |
download | dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.tar.gz dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
.xinitrc
.zprofile
Diffstat (limited to '.zprofile')
-rw-r--r-- | .zprofile | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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 |