diff options
| author | Juri Linkov | 2014-06-25 02:23:41 +0300 |
|---|---|---|
| committer | Juri Linkov | 2014-06-25 02:23:41 +0300 |
| commit | a4d8b73e1cb0f9c59a4f93170248dd85c5ee680c (patch) | |
| tree | 1729aa22cfaebeeb13b7f2bedd9c0bed433399eb /lisp/ChangeLog | |
| parent | 370ceb22102e02a25516e43a61da0c9a9d6e1579 (diff) | |
| download | emacs-a4d8b73e1cb0f9c59a4f93170248dd85c5ee680c.tar.gz emacs-a4d8b73e1cb0f9c59a4f93170248dd85c5ee680c.zip | |
* lisp/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.
Fixes: debbugs:17351
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
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 @@ | |||
| 1 | 2014-06-24 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * desktop.el (desktop-auto-save-enable) | ||
| 4 | (desktop-auto-save-disable): New functions. | ||
| 5 | (desktop-save-mode, desktop-auto-save-timeout): Use them. | ||
| 6 | (desktop-read): Disable the autosave before loading the desktop, | ||
| 7 | and enable afterwards. (Bug#17351) | ||
| 8 | |||
| 1 | 2014-06-24 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2014-06-24 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | Fix some indentation problem with \; and pipes (bug#17842). | 11 | Fix some indentation problem with \; and pipes (bug#17842). |