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 da8d49ae0a9..5981c50af77 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-24 Juri Linkov <juri@jurta.org>
+
+ * desktop.el (desktop-auto-save-enable)
+ (desktop-auto-save-disable): New functions.
+ (desktop-save-mode, desktop-auto-save-timeout): Use them.
+ (desktop-read): Disable the autosave before loading the desktop,
+ and enable afterwards. (Bug#17351)
+
2014-06-24 Stefan Monnier <monnier@iro.umontreal.ca>
Fix some indentation problem with \; and pipes (bug#17842).