From 7549bef3f49b8600290ad78552329394acf99476 Mon Sep 17 00:00:00 2001 From: Jens Schmidt Date: Tue, 29 Aug 2023 22:14:48 +0200 Subject: [PATCH 1/2] Update GnuPG-version-dependent information in docstring * lisp/epg.el (epg-context-set-passphrase-callback): Update GnuPG-version-dependent information in docstring and refer to Info node `(epa)' for details. --- lisp/epg.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/epg.el b/lisp/epg.el index 9da5a36ba3d..7add3dcd173 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -266,11 +266,11 @@ epg-context-set-passphrase-callback The function gets three arguments: the context, the key-id in question, and the callback data (if any). -The callback may not be called if you use GnuPG 2.x, which relies -on the external program called `gpg-agent' for passphrase query. -If you really want to intercept passphrase query, consider -installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase -query by itself and Emacs can intercept them." +The callback may not be called if you use GnuPG 2.0, which relies +only on external programs for passphrase query and does not +provide loopback pinentry. For details see Info node `(epa) +GnuPG version compatibility' and Info node `(epa) GnuPG +Pinentry'." ;; (declare (obsolete setf "25.1")) (setf (epg-context-passphrase-callback context) (if (functionp passphrase-callback) -- 2.30.2