summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 101ce8ec1d9..7cac121af0c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2010-05-01 Chong Yidong <cyd@stupidchicken.com>
+
+ * server.el (server-sentinel, server-start, server-force-delete):
+
+ * jka-compr.el (jka-compr-partial-uncompress)
+ (jka-compr-call-process, jka-compr-write-region, jka-compr-load):
+
+ * epg.el (epg--make-temp-file, epg-decrypt-string)
+ (epg-encrypt-string, epg-verify-string, epg-sign-string):
+
+ * diff.el (diff-sentinel): Bind delete-by-moving-to-trash to nil
+ before deleting (Bug#6070).
+
2010-05-01 Stefan Monnier <monnier@iro.umontreal.ca>
* bindings.el (mode-line-abbrev-mode, mode-line-auto-fill-mode):