conflict resolve

1 files changed, 21 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 81876d86165..d8ec0579422 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,24 @@
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * Makefile.in (LIB_FDATASYNC): New macro.
+        (emacsclient${EXEEXT}): Use it.
+        * emacsclient.c (main): Use fdatasync, not fsync, since we don't
+        care about metadata.  Keep trying if interrupted.
+        * movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
+        fsync is available everywhere (or there is a substitute).  Don't
+        report an error if fsync returns EINVAL.
+
+        Static checking by Sun C 5.12.
+        * etags.c (analyse_regex): Omit unreachable code.
+
+        * movemail.c (main): Call umask on all systems.
+        This is OK since Emacs already assumes umask elsewhere.
+        Don't grant more read permissions than necessary.
+        The old 0333 dates back to before we called setuid,
+        so it was needed back then to ensure user-readability,
+        but 0377 should suffice now.
+
 2013-02-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         * movemail.c (getenv): Remove decl (unused since 1994).