# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1378187123 -7200
# Node ID 37fb3d013086cef59ec269c15658df81ed16404c
# Parent  46fb22ffffa8882cc8d0aa72471f083f962ed41a# Parent  b2d78d66fa8c1e81789e121266281f897ec44a2e
Automated merge with https://xanthippe/hg/zsh-env

diff -r 46fb22ffffa8 -r 37fb3d013086 zshrc-xanthippe
--- a/zshrc-xanthippe	Thu Aug 29 09:16:57 2013 +0200
+++ b/zshrc-xanthippe	Tue Sep 03 07:45:23 2013 +0200
@@ -2,9 +2,15 @@
 # zshrc for xanthippe
 #
 
-. $HOME/.zsh-env/zshrc-jdk
-. $HOME/.zsh-env/zshrc-maven
-. $HOME/.zsh-env/zshrc-bindkey
+. ${HOME}/.zsh-env/zshrc-jdk
+. ${HOME}/.zsh-env/zshrc-maven
+. ${HOME}/.zsh-env/zshrc-bindkey
+
+GPG_AGENT_FILE="${HOME}/.gnupg/.gpg-agent-info"
+if [ -f "${GPG_AGENT_FILE}" ]; then
+    . "${GPG_AGENT_FILE}"
+    export GPG_AGENT_INFO
+fi
 
 export GPG_TTY=`tty`
 export PATH="$HOME/bin:${PATH}"