aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2016-02-22 06:05:14 +0900
committerDaiki Ueno2016-02-22 06:17:29 +0900
commit5f8965839d573032fc02be1298f37899cf61862d (patch)
tree682a41942edde49884a652f18e14e0e5e8e6304d
parentdb512249ddb02221716fd01f13b5ac6c045ed773 (diff)
downloademacs-5f8965839d573032fc02be1298f37899cf61862d.tar.gz
emacs-5f8965839d573032fc02be1298f37899cf61862d.zip
Mention how to enable pinentry feature
* etc/NEWS: Mention "gpgconf --reload gpg-agent". * lisp/net/pinentry.el: Likewise.
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/net/pinentry.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 6d57091e076..660af784b50 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1275,7 +1275,9 @@ few or no entries have changed.
1275minibuffer instead of a graphical dialog, depending on whether the gpg 1275minibuffer instead of a graphical dialog, depending on whether the gpg
1276command is called from Emacs (i.e., INSIDE_EMACS environment variable 1276command is called from Emacs (i.e., INSIDE_EMACS environment variable
1277is set). This feature requires newer versions of GnuPG (2.1.5 or 1277is set). This feature requires newer versions of GnuPG (2.1.5 or
1278later) and Pinentry (0.9.5 or later). 1278later) and Pinentry (0.9.5 or later). To use this feature, add
1279"allow-emacs-pinentry" to "~/.gnupg/gpg-agent.conf" and reload the
1280configuration with "gpgconf --reload gpg-agent".
1279 1281
1280+++ 1282+++
1281** cl-generic.el provides CLOS-style multiple-dispatch generic functions. 1283** cl-generic.el provides CLOS-style multiple-dispatch generic functions.
diff --git a/lisp/net/pinentry.el b/lisp/net/pinentry.el
index 27374afe4bf..285f86481bc 100644
--- a/lisp/net/pinentry.el
+++ b/lisp/net/pinentry.el
@@ -26,7 +26,8 @@
26;; This package allows GnuPG passphrase to be prompted through the 26;; This package allows GnuPG passphrase to be prompted through the
27;; minibuffer instead of graphical dialog. 27;; minibuffer instead of graphical dialog.
28;; 28;;
29;; To use, add allow-emacs-pinentry to ~/.gnupg/gpg-agent.conf, and 29;; To use, add "allow-emacs-pinentry" to "~/.gnupg/gpg-agent.conf",
30;; reload the configuration with "gpgconf --reload gpg-agent", and
30;; start the server with M-x pinentry-start. 31;; start the server with M-x pinentry-start.
31;; 32;;
32;; The actual communication path between the relevant components is 33;; The actual communication path between the relevant components is