summaryrefslogtreecommitdiff
path: root/lisp/pgg-gpg.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2007-02-17 20:39:55 +0000
committerRichard M. Stallman <rms@gnu.org>2007-02-17 20:39:55 +0000
commit4ebb03e66b8e198df1d65d2fe8f599454aa65a3e (patch)
tree43a433835ecc2497593950051e3b953a7c1985fd /lisp/pgg-gpg.el
parent9230e12ddee19c53f1e0248d294fdb3520170abc (diff)
downloademacs-4ebb03e66b8e198df1d65d2fe8f599454aa65a3e.tar.gz
(pgg-gpg-process-region): Make USE-AGENT nil if PASSPHRASE is given.
Diffstat (limited to 'lisp/pgg-gpg.el')
-rw-r--r--lisp/pgg-gpg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 84bf81a858e..a2cd14eaae3 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -61,7 +61,7 @@
"GnuPG ID of your default identity.")
(defun pgg-gpg-process-region (start end passphrase program args)
- (let* ((use-agent (pgg-gpg-use-agent-p))
+ (let* ((use-agent (and (null passphrase) (pgg-gpg-use-agent-p)))
(output-file-name (pgg-make-temp-file "pgg-output"))
(args
`("--status-fd" "2"