aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2015-08-18 11:19:41 +0900
committerDaiki Ueno2015-08-18 11:20:10 +0900
commit3a23c477d90ce7401c24de8610be7d1340cd8ee3 (patch)
treea2f4f67a8cbb48b32ec9e2645d8a17d771dcc44c
parent9bc757830a9c6edeb950c294a32f058504550148 (diff)
downloademacs-3a23c477d90ce7401c24de8610be7d1340cd8ee3.tar.gz
emacs-3a23c477d90ce7401c24de8610be7d1340cd8ee3.zip
; pinentry.el: Update header comment and fix typos
-rw-r--r--lisp/net/pinentry.el10
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/net/pinentry.el b/lisp/net/pinentry.el
index 05cb124f2cb..13a15c964ab 100644
--- a/lisp/net/pinentry.el
+++ b/lisp/net/pinentry.el
@@ -43,10 +43,8 @@
43;; subset of the Pinentry Assuan protocol described in (info 43;; subset of the Pinentry Assuan protocol described in (info
44;; "(pinentry) Protocol"). 44;; "(pinentry) Protocol").
45;; 45;;
46;; NOTE: As of June 2015, this feature requires newer versions of 46;; NOTE: As of August 2015, this feature requires newer versions of
47;; GnuPG (2.1.5+) and Pinentry (not yet released, possibly 0.9.5+). 47;; GnuPG (2.1.5+) and Pinentry (0.9.5+).
48;; For details, see the discussion on gnupg-devel mailing list:
49;; <https://lists.gnupg.org/pipermail/gnupg-devel/2015-May/029875.html>.
50 48
51;;; Code: 49;;; Code:
52 50
@@ -56,12 +54,12 @@
56 :group 'external) 54 :group 'external)
57 55
58(defcustom pinentry-popup-prompt-window t 56(defcustom pinentry-popup-prompt-window t
59 "If non-nil, display status information from epa commands in another window." 57 "If non-nil, display multiline prompt in another window."
60 :type 'boolean 58 :type 'boolean
61 :group 'pinentry) 59 :group 'pinentry)
62 60
63(defcustom pinentry-prompt-window-height 5 61(defcustom pinentry-prompt-window-height 5
64 "Number of lines used to display status information." 62 "Number of lines used to display multiline prompt."
65 :type 'integer 63 :type 'integer
66 :group 'pinentry) 64 :group 'pinentry)
67 65