summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/epa-file.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9419f4d1da4..d14ef8399b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20 Daiki Ueno <ueno@unixuser.org>
+
+ * epa-file.el (epa-file-cache-passphrase-for-symmetric-encryption):
+ Document that this option is not recommended to use.
+
2009-09-19 Glenn Morris <rgm@gnu.org>
* calc/calc-graph.el (calc-graph-lookup): Avoid assignment to free
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index fc753df312c..d0df8c9ff38 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -25,7 +25,11 @@
(require 'epa-hook)
(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil
- "If non-nil, cache passphrase for symmetric encryption."
+ "If non-nil, cache passphrase for symmetric encryption.
+
+For security reasons, this option is turned off by default and
+not recommended to use. Use public-key encryption with gpg-agent
+instead, which does the same job in a safer way."
:type 'boolean
:group 'epa-file)