# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1423014988 -3600
# Node ID 16d8d652fcf1511972b438baf2ec8d6d022662e3
# Parent  582fde73557e8d908d8790791142a4ee114fb622# Parent  37fb3d013086cef59ec269c15658df81ed16404c
Automated merge with https://localhost/hg/zsh-env

diff -r 582fde73557e -r 16d8d652fcf1 zshrc-xanthippe
--- a/zshrc-xanthippe	Wed Feb 04 02:21:39 2015 +0100
+++ b/zshrc-xanthippe	Wed Feb 04 02:56:28 2015 +0100
@@ -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}"