auto upstream

5 files changed, 16 insertions, 10 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 367f7c63264..efa2c26b808 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        FILE's lock is now always .#FILE and may be a regular file (Bug#13807).
+        * NEWS: Document this.
+
 2013-03-02  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.5.
diff --git a/etc/NEWS b/etc/NEWS
index 8ae8ae3bf16..29ff9399930 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -320,7 +320,7 @@ text-property on the first char.
 ** The `defalias-fset-function' property lets you catch calls to defalias
 and redirect them to your own function instead of `fset'.
 
-** The lock for 'DIR/FILE' is now 'DIR/.#FILE' or 'DIR/.#-FILE'.
+** 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
@@ -328,9 +328,8 @@ 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 MS-Windows the lock is a regular file DIR/.#-FILE, not a symlink.
-MS-Windows and non-MS-Windows implementations of Emacs ignore each
-other's locks.
+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.
 
 ** The 9th element returned by `file-attributes' is now unspecified.
 Formerly, it was t if the file's gid would change if file were deleted
diff --git a/etc/images/mail/README b/etc/images/mail/README
index 962206e6ae8..279e9cc5723 100644
--- a/etc/images/mail/README
+++ b/etc/images/mail/README
@@ -1,4 +1,4 @@
-COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES -*- coding: utf-8 -*-
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
 but are distributed and used by Emacs.  They are licensed under the
@@ -25,7 +25,7 @@ save.xpm                    combines stock_mail, io/stock_save and
 send.xpm                    stock_mail-send
 spam.xpm                    stock_spam
 
-(preview and save were contributed by Adam Sjøgren <asjo@koldfront.dk>)
+(preview and save were contributed by Adam Sjøgren <asjo@koldfront.dk>)
 
 repack is a slightly modified version of package-x-generic.
 reply-from is a slightly modified version of reply.
diff --git a/etc/images/smilies/grayscale/README b/etc/images/smilies/grayscale/README
index 43f91b7af3a..031b096ee21 100644
--- a/etc/images/smilies/grayscale/README
+++ b/etc/images/smilies/grayscale/README
@@ -1,6 +1,7 @@
+-*- coding: utf-8 -*-
 Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
-       smile.xpm wry.xpm 
-Author: Adam Sjøgren
+       smile.xpm wry.xpm
+Author: Adam Sjøgren
 Copyright (C) 2007-2013 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/medium/README b/etc/images/smilies/medium/README
index 43f91b7af3a..031b096ee21 100644
--- a/etc/images/smilies/medium/README
+++ b/etc/images/smilies/medium/README
@@ -1,6 +1,7 @@
+-*- coding: utf-8 -*-
 Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
-       smile.xpm wry.xpm 
-Author: Adam Sjøgren
+       smile.xpm wry.xpm
+Author: Adam Sjøgren
 Copyright (C) 2007-2013 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)