* doc/emacs/files.texi (Interlocking): Copyedit.

* etc/NEWS: Related small edits.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c10f3e0..8ef2f46 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-24  Glenn Morris  <rgm@gnu.org>
+
+       * files.texi (Interlocking): Copyedit.
+
 2014-01-23  Glenn Morris  <rgm@gnu.org>
 
        * building.texi (Lisp Eval): Update prefix argument behavior

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 1b6211a..3b9aefa 100644 (file)
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -752,9 +752,10 @@ file.
 @cindex locking files
   When you make the first modification in an Emacs buffer that is
 visiting a file, Emacs records that the file is @dfn{locked} by you.
-(It does this by creating a specially-named symbolic link or regular
-file with special contents in the same directory.)  Emacs removes the
-lock when you save the changes.  The idea is that the file is locked
+(It does this by creating a specially-named symbolic link@footnote{If
+your file system does not support symbolic links, a regular file is
+used.} with special contents in the same directory.)  Emacs removes the lock
+when you save the changes.  The idea is that the file is locked
 whenever an Emacs buffer visiting it has unsaved changes.
 
 @vindex create-lockfiles

diff --git a/etc/NEWS b/etc/NEWS
index a4a1a41..7226433 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1265,17 +1265,6 @@ These attributes are only meaningful for coding-systems of type
 
 ** `time-to-seconds' is not obsolete any more.
 
-** The lock for 'DIR/FILE' is now 'DIR/.#FILE' and may be a regular file.
-When you edit DIR/FILE, Emacs normally creates a symbolic link
-DIR/.#FILE as a lock that warns other instances of Emacs that DIR/FILE
-is being edited.  Formerly, if there was already a non-symlink file
-named DIR/.#FILE, Emacs fell back on the lock names DIR/.#FILE.0
-through DIR/.#FILE.9.  These fallbacks have been removed, so that
-Emacs now no longer locks DIR/FILE in that case.
-
-On file systems that do not support symbolic links, the lock is now a
-regular file with contents being what would have been in the symlink.
-
 +++
 ** New functions `group-gid' and `group-real-gid'.
 
@@ -1283,6 +1272,15 @@ regular file with contents being what would have been in the symlink.
 ** The spelling of the rx.el category `chinese-two-byte' has been
 corrected (the first 'e' was missing).
 
+---
+** Minor internal changes to the details of lock files.
+The lock for DIR/FILE is now _always_ DIR/.#FILE.
+If DIR/.#FILE already exists and is not an Emacs lock file,
+Emacs makes no attempt to lock DIR/FILE.  (Previously, it fell back to
+numbered lock files DIR/.#FILE.0...).
+On file systems that do not support symbolic links, the lock is now a
+regular file with contents being what would have been in the symlink.
+
 ** Changes to the Emacs Lisp Coding Conventions in Emacs 24.4
 
 +++
@@ -1331,7 +1329,7 @@ modifying it has no effect.
 
 ---
 ** Lock files now work on MS-Windows.
-This allows to avoid losing your edits if the same file is being
+This helps to prevent losing your edits if the same file is being
 edited in another Emacs session or by another user.  See the node
 "Interlocking" in the Emacs User Manual for the details.  To disable
 file locking, customize `create-lockfiles' to nil.