auto upstream

1 files changed, 48 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b8b3c56004..adff00f7189 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,51 @@
+2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
+        The old approach, which fell back on DIR/.#FILE.0 through
+        DIR/.#FILE.9, had race conditions that could not be easily fixed.
+        If DIR/.#FILE is a non-symlink file, Emacs now does not create a
+        lock file for DIR/FILE; that is, DIR/FILE is no longer partly
+        protected by a lock if DIR/.#FILE is a non-symlink file ("partly"
+        because the locking mechanism was never reliable in that case).
+        This patch fixes this and other bugs discovered by a code
+        inspection that was prompted by
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00531.html>.
+        Also, this patch switches to .#-FILE (not .#FILE) on MS-Windows,
+        to avoid interoperability problems between the MS-Windows and
+        non-MS-Windows implementations.  MS-Windows and non-MS-Windows
+        instances of Emacs now ignore each others' locks.
+        * filelock.c (defined_WINDOWSNT): New constant.
+        (MAKE_LOCK_NAME, fill_in_lock_file_name):
+        Don't create DIR/.#FILE.0 through DIR/.#FILE.9.  Instead, create
+        DIR/.#FILE symlinks on non-MS-Windows hosts, and DIR/.#-FILE
+        regular files on MS-Windows hosts.
+        (MAKE_LOCK_NAME, unlock_file, Ffile_locked_p):
+        Use SAFE_ALLOCA to avoid problems with long file names.
+        (MAX_LFINFO): Now a local constant, not a global macro.
+        (IS_LOCK_FILE): Remove.
+        (lock_file_1): Don't inspect errno if symlink call succeeds;
+        that's not portable.
+        (lock_file): Document that this function can return if lock
+        creation fails.
+        (lock_file): Don't access freed storage.
+
+2013-03-02  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren.  (Bug#13734)
+
+2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * textprop.c: Use bool for booleans.
+        (validate_interval_range, Fadd_text_properties)
+        (Fremove_text_properties): Prefer bool to int when either works.
+
+2013-03-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * textprop.c (Fadd_text_properties, Fremove_text_properties): If
+        the interval tree changes as a side effect of calling
+        modify_region, re-do processing starting from the call to
+        validate_interval_range.  (Bug#13743)
+
 2013-02-28  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (sys_open): Don't reset the flags for FD in fd_info[].