# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1181639491 0
# Node ID 9afe4aab01d1d2d6f9eb5b35c98c54d2175e78bc
# Parent  71d53e1b86d0cd65e66cf4c2018c02c303f52921
*** empty log message ***

diff -r 71d53e1b86d0 -r 9afe4aab01d1 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jun 12 09:10:05 2007 +0000
+++ b/lisp/ChangeLog	Tue Jun 12 09:11:31 2007 +0000
@@ -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.