diff options
| author | Daiki Ueno <[email protected]> | 2015-07-01 01:39:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-07-01 12:15:31 +0000 |
| commit | f1490a3a0ecf4a5a03373c9563f7709630232ee3 (patch) | |
| tree | 57ade679341577c65a3cb01567f605b70961dbd2 | |
| parent | po: Auto-update (diff) | |
| download | gnupg-f1490a3a0ecf4a5a03373c9563f7709630232ee3.tar.gz gnupg-f1490a3a0ecf4a5a03373c9563f7709630232ee3.zip | |
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 <[email protected]>
| -rw-r--r-- | agent/gpg-agent.c | 5 |
1 files changed, 5 insertions, 0 deletions
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, |