summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2007-06-12 09:11:31 +0000
committerJuanma Barranquero <lekktu@gmail.com>2007-06-12 09:11:31 +0000
commit372e7436513fb62af6be2a3e26d4153b6aaa5436 (patch)
tree426fadaa1ae41c11ddb212e986b67bc6d313be7d
parenta985aa4c72d27c2d9b382d150a1f6ac5deb4f3ca (diff)
downloademacs-372e7436513fb62af6be2a3e26d4153b6aaa5436.tar.gz
*** empty log message ***
-rw-r--r--lisp/ChangeLog13
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 @@
+2007-06-12 Davis Herring <herring@lanl.gov>
+
+ * desktop.el (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.
+
2007-06-12 Stefan Monnier <monnier@iro.umontreal.ca>
* emulation/tpu-mapper.el (tpu-emacs-map-key): Use new keymap names.