2 files changed, 12 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b6db44b1e9b..c783ac3426b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Mention desktop locking.
+
 2007-09-28  Glenn Morris  <rgm@gnu.org>
 
         * PROBLEMS: Mention Tex superscript font issue.
diff --git a/etc/NEWS b/etc/NEWS
index f9caea51f0c..15fbb6c83d3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -59,7 +59,7 @@ Windows XP introduced themed scrollbars, but applications have to take
 special steps to use them. Emacs now has the appropriate resources linked
 in to make it use the scrollbars from the system theme.
 
-** focus-follows-mouse defaults to nil on MS Windows
+** focus-follows-mouse defaults to nil on MS Windows.
 Previously this variable was incorrectly documented as having no effect
 on MS Windows, and the default was inappropriate for the majority of
 Windows installations. Users of software which modifies the behaviour of
@@ -70,6 +70,13 @@ this variable.
 was needed.  In text command mode, if you have problems before execution has
 started, use M-x gud-gdb.
 
+** desktop.el now detects conflicting uses of the desktop file.
+When loading the desktop, desktop.el can now detect that the file is already
+in use.  The default behavior is to ask the user what to do, but you can
+customize it with the new option `desktop-load-locked-desktop'.  When saving,
+desktop.el warns about attempts to overwrite a desktop file if it determines
+that the desktop being saved is not an update of the one on disk.
+
 * New Modes and Packages in Emacs 22.2
 
 ** bibtex-style-mode helps you write BibTeX's *.bst files.