aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2011-09-27 15:01:27 +0900
committerDaiki Ueno2011-09-27 15:01:27 +0900
commit90926e239289bf6db8938da4b50adc62222ed802 (patch)
tree4f3f79ba5037899a4a7f483273342cfe706768f4
parent9aa99d0176c2021194f38eb27668395cd242395f (diff)
downloademacs-90926e239289bf6db8938da4b50adc62222ed802.tar.gz
emacs-90926e239289bf6db8938da4b50adc62222ed802.zip
Clarify plstore-select-keys documentation.
* plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify documentation.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/plstore.el10
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ab324b7cd8b..c535f4a9549 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12011-09-27 Daiki Ueno <ueno@unixuser.org>
2
3 * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
4 documentation.
5
12011-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * nnimap.el (nnimap-wait-for-response): Message less (bug#9540). 8 * nnimap.el (nnimap-wait-for-response): Message less (bug#9540).
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index ab78e508480..340c7255958 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -80,9 +80,10 @@
80 "Control whether or not to pop up the key selection dialog. 80 "Control whether or not to pop up the key selection dialog.
81 81
82If t, always asks user to select recipients. 82If t, always asks user to select recipients.
83If nil, query user only when `plstore-encrypt-to' is not set. 83If nil, query user only when a file's default recipients are not
84If neither t nor nil, doesn't ask user. In this case, symmetric 84known (i.e. `plstore-encrypt-to' is not locally set in the buffer
85encryption is used." 85visiting a plstore file).
86If neither t nor nil, doesn't ask user."
86 :type '(choice (const :tag "Ask always" t) 87 :type '(choice (const :tag "Ask always" t)
87 (const :tag "Ask when recipients are not set" nil) 88 (const :tag "Ask when recipients are not set" nil)
88 (const :tag "Don't ask" silent)) 89 (const :tag "Don't ask" silent))
@@ -90,7 +91,8 @@ encryption is used."
90 91
91(defvar plstore-encrypt-to nil 92(defvar plstore-encrypt-to nil
92 "*Recipient(s) used for encrypting secret entries. 93 "*Recipient(s) used for encrypting secret entries.
93May either be a string or a list of strings.") 94May either be a string or a list of strings. If it is nil,
95symmetric encryption will be used.")
94 96
95(put 'plstore-encrypt-to 'safe-local-variable 97(put 'plstore-encrypt-to 'safe-local-variable
96 (lambda (val) 98 (lambda (val)