From f1490a3a0ecf4a5a03373c9563f7709630232ee3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 1 Jul 2015 10:39:40 +0900 Subject: agent: Unset INSIDE_EMACS on gpg-agent startup * agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar. -- The variable is set only temporarily when gpg is called from Emacs, keeping it during the session makes no sense. Signed-off-by: Daiki Ueno --- agent/gpg-agent.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index c3ab1759e..84f8be0a1 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1183,6 +1183,11 @@ main (int argc, char **argv ) gnupg_unsetenv ("DISPLAY"); #endif + /* Remove the INSIDE_EMACS variable so that a pinentry does not + always try to interact with Emacs. The variable is set when + a client requested this using an OPTION command. */ + gnupg_unsetenv ("INSIDE_EMACS"); + /* Create the sockets. */ socket_name = create_socket_name (GPG_AGENT_SOCK_NAME, 1); fd = create_server_socket (socket_name, 1, 0, -- cgit v1.2.3