diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pgg-gpg.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b1ce300df67..49fd9309381 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-02-17 Daiki Ueno <ueno@unixuser.org> + + * pgg-gpg.el (pgg-gpg-process-region): Make USE-AGENT nil + if PASSPHRASE is given. + 2007-02-17 Chris Moore <dooglus@gmail.com> * jka-cmpr-hook.el (jka-compr-compression-info-list): Recognize 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" |