diff options
| author | Juanma Barranquero | 2007-06-12 09:11:31 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-06-12 09:11:31 +0000 |
| commit | e88110dbfc271c45802d97a4c518e276d6e42b0d (patch) | |
| tree | f95a58dd523153a24b4478910d65a193af029d3d /lisp/ChangeLog | |
| parent | 3f7194edd4c350e7e1cbc72aa4868e58157211aa (diff) | |
| download | emacs-e88110dbfc271c45802d97a4c518e276d6e42b0d.tar.gz emacs-e88110dbfc271c45802d97a4c518e276d6e42b0d.zip | |
(desktop-save-mode-off): New function.
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it. Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts. Manage the lock.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f28aac05b4f..b135c84b2cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2007-06-12 Davis Herring <herring@lanl.gov> | ||
| 2 | |||
| 3 | * desktop.el (desktop-save-mode-off): New function. | ||
| 4 | (desktop-base-lock-name, desktop-not-loaded-hook): New variables. | ||
| 5 | (desktop-full-lock-name, desktop-file-modtime, desktop-owner) | ||
| 6 | (desktop-claim-lock, desktop-release-lock): New functions. | ||
| 7 | (desktop-kill): Tell `desktop-save' that this is the last save. | ||
| 8 | Release the lock afterwards. | ||
| 9 | (desktop-buffer-info): New function. | ||
| 10 | (desktop-save): Use it. Run `desktop-save-hook' where the doc | ||
| 11 | says to. Detect conflicts, and manage the lock. | ||
| 12 | (desktop-read): Detect conflicts. Manage the lock. | ||
| 13 | |||
| 1 | 2007-06-12 Stefan Monnier <monnier@iro.umontreal.ca> | 14 | 2007-06-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 15 | ||
| 3 | * emulation/tpu-mapper.el (tpu-emacs-map-key): Use new keymap names. | 16 | * emulation/tpu-mapper.el (tpu-emacs-map-key): Use new keymap names. |