aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2024-02-17 11:31:20 +0200
committerEli Zaretskii2024-02-17 11:31:20 +0200
commitd85461ac61c5ea99ea194f99c771de1efdabbef4 (patch)
tree2e7b5afc5365f672f53b081ba2242d22d92546a2
parent6477be93bd8a29cba8ce383f9ea3fba23c45f225 (diff)
downloademacs-d85461ac61c5ea99ea194f99c771de1efdabbef4.tar.gz
emacs-d85461ac61c5ea99ea194f99c771de1efdabbef4.zip
; Fix last change
* doc/misc/epa.texi (Cryptographic operations on regions): Fix wording of the 'epa-keys-select-method's documentation. * lisp/epa.el (epa-keys-select-method): Doc fix (bug#69133).
-rw-r--r--doc/misc/epa.texi10
-rw-r--r--lisp/epa.el3
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index cd6da1dadba..f450b9cbdd9 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -289,11 +289,13 @@ also ask you whether or not to sign the text before encryption and if
289you answered yes, it will let you select the signing keys. 289you answered yes, it will let you select the signing keys.
290@end deffn 290@end deffn
291 291
292You can change the default method that is used to select keys with the
293variable @code{epa-file-select-keys}.
294
295@defvar epa-keys-select-method 292@defvar epa-keys-select-method
296Method used to select keys in @code{epa-select-keys}. 293This variable controls the method used for key selection in
294@code{epa-select-keys}. The default value @code{buffer} pops up a
295special buffer where you can select the keys. If the value is
296@code{minibuffer}, @code{epa-select-keys} will instead prompt for the
297keys in the minibuffer, where you should type the keys separated by
298commas.
297@end defvar 299@end defvar
298 300
299@node Cryptographic operations on files 301@node Cryptographic operations on files
diff --git a/lisp/epa.el b/lisp/epa.el
index b2593bc62ba..c29df18bb58 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -77,7 +77,8 @@ The command `epa-mail-encrypt' uses this."
77 "Method used to select keys in `epa-select-keys'. 77 "Method used to select keys in `epa-select-keys'.
78If the value is \\='buffer, the default, keys are selected via a 78If the value is \\='buffer, the default, keys are selected via a
79pop-up buffer. If the value is \\='minibuffer, keys are selected 79pop-up buffer. If the value is \\='minibuffer, keys are selected
80via the minibuffer instead, using `completing-read-multiple'." 80via the minibuffer instead, using `completing-read-multiple'.
81Any other value is treated as \\='buffer."
81 :type '(choice (const :tag "Read keys from a pop-up buffer" buffer) 82 :type '(choice (const :tag "Read keys from a pop-up buffer" buffer)
82 (const :tag "Read keys from minibuffer" minibuffer)) 83 (const :tag "Read keys from minibuffer" minibuffer))
83 :group 'epa 84 :group 'epa