summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 852a73735f6..ec28bbb1eaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-12 Chong Yidong <cyd@stupidchicken.com>
+
+ * epg.el (epg-delete-output-file, epg-decrypt-string)
+ (epg-verify-string, epg-sign-string, epg-encrypt-string): Bind
+ delete-by-moving-to-trash to nil.
+
+ * epa-file.el (epa-file-insert-file-contents): Likewise.
+
2011-02-10 Glenn Morris <rgm@gnu.org>
* emacs-lisp/cl-seq.el (union, nunion, intersection)