[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      07/06/24 20:03:09

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11049.2.101
retrieving revision 1.11049.2.102
diff -u -b -r1.11049.2.101 -r1.11049.2.102
--- ChangeLog   23 Jun 2007 11:24:56 -0000      1.11049.2.101
+++ ChangeLog   24 Jun 2007 20:03:06 -0000      1.11049.2.102
@@ -1,3 +1,27 @@
+2007-06-24  Juanma Barranquero  <address@hidden>
+
+       * desktop.el (desktop-read): Run `desktop-not-loaded-hook' in the
+       directory where the desktop file was found, as the docstring says.
+       (desktop-kill): Use `read-directory-name'.
+
+       * desktop.el (desktop-load-locked-desktop): New option.
+       (desktop-read): Use it.
+       (desktop-truncate, desktop-outvar, desktop-restore-file-buffer):
+       Use `when'.
+
+2007-06-24  Davis Herring  <address@hidden>
+
+       * 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-23  Eli Zaretskii  <address@hidden>
 
        * ls-lisp.el (insert-directory): If an invalid regexp error is