From 2d6965f85645ea489b0adf8ce6a79dd55036d883 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 26 May 2020 17:59:45 +0200
Subject: Fix load of various plugins: fastfile, keychain, sfffe, stack

---
 plugins/keychain/keychain.plugin.zsh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'plugins/keychain/keychain.plugin.zsh')

diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index 1babf5a30..f122f7982 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -1,7 +1,9 @@
+(( $+commands[keychain] )) || return
+
 # Define SHORT_HOST if not defined (%m = host name up to first .)
 SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
 
-function _start_agent() {
+function {
 	local agents
 	local -a identities
 	local -a options
@@ -28,8 +30,3 @@ function _start_agent() {
 	[ -f "$_keychain_env_sh" ]     && . "$_keychain_env_sh"
 	[ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg"
 }
-
-_start_agent
-
-# tidy up after ourselves
-unfunction _start_agent
-- 
cgit v1.2.3-70-g09d2