Merge from trunk and resolve conflicts.

35 files changed, 521 insertions, 156 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0e66f723a2c..03bd86a3216 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,207 @@
+2013-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
+        (bootstrap, bootstrap-nmake, bootstrap-gmake, install-addpm):
+        Depend on .exe files.
+
+        * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to
+        avoid MinGW64 compiler warnings in editfns.c.
+
+        Fix rules for parallel builds.
+        * makefile.w32-in (ALL): Depend on *.exe files, not on phony names
+        without the .exe suffix.
+        (addpm, ddeclient, cmdproxy, addsection, preprep): Remove phony
+        targets.
+        (.PHONY): Remove.
+
+        * addpm.c (_WIN32_IE) [_W64]: Move after inclusion of standard
+        headers, since that's where _W64 is declared by MinGW64.
+
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS): Don't define.
+        (HAVE__SETJMP) [_W64]: Undefine for MinGW64.
+
+        * addsection.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not
+        define for MinGW64.
+
+        * preprep.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not define
+        for MinGW64.
+
+        Fix more incompatibilities between MinGW.org and MinGW64 headers
+        reported by Óscar Fuentes in
+        http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00733.html
+        http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html
+        and in
+        http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html.
+        * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1.
+        For MinGW64, include sys/types.h and time.h.
+        (_WIN32_WINNT) [!_W64]: Don't define for MinGW64.
+
+        * inc/sys/stat.h (chmod): Remove _CRTIMP from prototype.
+
+        * inc/sys/time.h (struct timeval) [!_W64]: Guard definition with
+        _W64.
+        (struct timezone) [!_TIMEZONE_DEFINED]: Guard definition with
+        _TIMEZONE_DEFINED.
+
+        * addpm.c (_WIN32_IE) [_W64]: For MinGW64, don't define to 0x400.
+
+        * inc/sys/stat.h: Remove _CRTIMP from prototypes of fstat, stat,
+        lstat, and fstatat.
+
+2013-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix incompatibilities between MinGW.org and MinGW64 headers
+        reported by Óscar Fuentes in
+        http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00611.html.
+        * inc/ms-w32.h (struct timespec): Don't define if
+        _TIMESPEC_DEFINED is already defined.
+        (sigset_t) [!_POSIX]: Typedef for MinGW64.
+        (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Move definitions before
+        including the first system header, to avoid redefinition if some
+        system header defines a default value.
+
+        * inc/sys/time.h (struct itimerval): Don't define if
+        _TIMESPEC_DEFINED is already defined.
+
+2013-03-16  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix the MSVC build.  (Bug#13939)
+        * inc/stdint.h (UINTPTR_MAX): Define.
+
+        * nmake.defs (libc): Fix syntax of !if conditional.
+
+2013-03-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (BSD_SYSTEM, BSD_SYSTEM_AHB, HAVE_ALARM, HAVE__PUTENV): Remove.
+        (HAVE_DECL_ALARM, HAVE_DECL_FDATASYNC, HAVE_DECL__PUTENV)
+        (HAVE_FDATASYNC): New macros.
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * inc/ms-w32.h (fdatasync): New macro, suggested by Eli Zaretskii.
+
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        FILE's lock is now always .#FILE and may be a regular file (Bug#13807).
+        * inc/unistd.h (O_NOFOLLOW): New macro.
+
+2013-03-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (DATA_START, ORDINARY_LINK): Remove.
+        (HAVE_DATA_START, HAVE__PUTENV): New macros.
+
+2013-02-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h (BOOT_TIME_FILE): Define.
+
+        * config.nt (CLASH_DETECTION): Define to 1.
+
+2013-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h (__STDC__): Fiddle with value only for MSVC.
+        (Bug#9066)
+        (chown, logb): Remove, unused.
+
+2013-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (GC_MARK_STACK): Remove.
+        (GNULIB_FDOPENDIR, HAVE_DECL_FDOPENDIR, HAVE_DECL_MEMRCHR)
+        (HAVE_DIRENT_H, HAVE_FDOPENDIR, HAVE_FSTATAT, HAVE_MEMRCHR)
+        (HAVE_WORKING_FSTATAT_ZERO_FLAG, _NETBSD_SOURCE): New macros.
+
+2013-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h: Add prototype for memrchr.
+
+2013-02-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539).
+        * inc/sys/stat.h (fstatat):
+        * inc/unistd.h (readlinkat): New decls.
+
+2013-01-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/dirent.h (opendir): Update prototype.
+
+2013-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/unistd.h (O_IGNORE_CTTY): Define, as it is unconditionally
+        used in term.c.  (Bug#13387)
+
+2013-01-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (HAVE_GTK_HANDLE_BOX_NEW, HAVE_GTK_TEAROFF_MENU_ITEM_NEW): New macros.
+
+2012-12-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/sys/stat.h (S_ISMPX): Define to zero, to accommodate changes
+        in lib/filemode.c that broke the MS-Windows build.
+        Suggested by Andy Moreton <andrewjmoreton@gmail.com>.
+
+2012-12-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (BSD4_2): Remove.
+
+2012-12-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/sys/acl.h: New file.
+
+        * inc/ms-w32.h (ENOTSUP): Define if undefined.
+
+        * config.nt (HAVE_POSIX_ACL): Define.
+
+2012-12-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h (sys_unlink): Provide prototype.
+
+2012-12-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/sys/stat.h: Declare w32_stat_get_owner_group.
+
+2012-12-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (HAVE_INOTIFY, HAVE_SYS_INOTIFY_H): New macros.
+
+2012-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+        (HAVE_DECL_UNSETENV, HAVE_SIG2STR, VOID_UNSETENV): New macros.
+        (ULIMIT_BREAK_VALUE): Remove.
+
+2012-12-10  Daniel Colascione  <dancol@dancol.org>
+
+        * emacs.rc: Use forward slashes in relative paths in order to
+        avoid complaints from Cygwin.  (Forward slashes work perfectly
+        well in the NT build.)
+
+2012-12-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/unistd.h (unsetenv): Provide a prototype.
+
+2012-12-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h (putenv): Redirect to sys_putenv.
+        (sys_putenv): Add prototype.
+
+        * config.nt (HAVE_UNSETENV): Define to 1.
+
+2012-12-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+
+2012-11-24  Ken Brown  <kbrown@cornell.edu>
+
+        * config.nt (HAVE_MOUSE): Remove.
+
 2012-11-23  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
@@ -2852,7 +3056,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/nt/INSTALL b/nt/INSTALL
index 2293610adf3..0c4b50f0c28 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
                     Building and Installing Emacs on Windows
                           (from 95 to 7 and beyond)
 
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2013 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
 * For the impatient
@@ -110,12 +110,14 @@
   WinZip is known to create some subtle and hard to debug problems,
   such as converting files to DOS CR-LF format, not creating empty
   directories, etc.  We suggest to use djtarnt.exe from the GNU FTP
-  site.
+  site.  For modern formats, such as .tar.xz, we suggest bsdtar.exe
+  from the libarchive package; its precompiled Windows binaries are
+  available from this site:
+
+    http://sourceforge.net/projects/ezwinports/files/
 
-  In addition to this file, you should also read INSTALL.BZR in the
-  parent directory, and make sure that you have a version of
-  "touch.exe" in your path, and that it will create files that do not
-  yet exist.
+  In addition to this file, if you build a development snapshot, you
+  should also read INSTALL.BZR in the parent directory.
 
 * Supported development environments
 
diff --git a/nt/README b/nt/README
index 483398698e4..c112c828fca 100644
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,6 @@
              Emacs for Windows NT/2000 and Windows 95/98/ME
 
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2013 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
   This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/README.W32 b/nt/README.W32
index e2197ba5adf..3e51b30af50 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 2001-2013 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                            Emacs for Windows
diff --git a/nt/addpm.c b/nt/addpm.c
index 361726b10e8..688e0167334 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,5 +1,5 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -34,16 +34,21 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    installed, then the DDE fallback for creating icons the Windows 3.1
    progman way will be used instead, but that is prone to lockups
    caused by other applications not servicing their message queues.  */
+#include <stdlib.h>
+#include <stdio.h>
+#include <malloc.h>
+
+/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
+   below 0x500.  */
+#ifndef _W64
 #define _WIN32_IE 0x400
+#endif
 /* Request C Object macros for COM interfaces.  */
 #define COBJMACROS 1
 
 #include <windows.h>
 #include <shlobj.h>
 #include <ddeml.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <malloc.h>
 
 HDDEDATA CALLBACK
 DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
diff --git a/nt/addsection.c b/nt/addsection.c
index d720dec428f..61a8cfce742 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,5 +1,5 @@
 /* Add an uninitialized data section to an executable.
-   Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 7c522440072..7d810e3365c 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,5 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2013 Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatibility
    with elisp code written for Unix.  When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index ba63d2c4833..3d606258fc0 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
 /* GNU Emacs site configuration template file.
 
-Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc.
+Copyright (C) 1988, 1993-1994, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -60,15 +60,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define on FreeBSD to work around an issue when reading from a PTY. */
 #undef BROKEN_PTY_READ_AFTER_EAGAIN
 
-/* Define if the system is compatible with BSD 4.2. */
-#undef BSD4_2
-
-/* Define if the system is compatible with BSD 4.2. */
-#undef BSD_SYSTEM
-
-/* Define if AH_BOTTOM should change BSD_SYSTEM. */
-#undef BSD_SYSTEM_AHB
-
 /* Define if Emacs cannot be dumped on your system. */
 #undef CANNOT_DUMP
 
@@ -78,10 +69,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if you want lock files to be written, so that Emacs can tell
    instantly when you try to modify a file that someone else has modified in
    his/her Emacs. */
-#undef CLASH_DETECTION
+#define CLASH_DETECTION 1
 
 /* Short copyright string for this version of Emacs. */
-#define COPYRIGHT "Copyright (C) 2012 Free Software Foundation, Inc."
+#define COPYRIGHT "Copyright (C) 2013 Free Software Foundation, Inc."
 
 /* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
    systems. This function is required for 'alloca.c' support on those systems.
@@ -100,9 +91,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */
 #undef DATA_SEG_BITS
 
-/* Address of the start of the data segment. */
-#undef DATA_START
-
 /* Name of the default sound device. */
 #undef DEFAULT_SOUND_DEVICE
 
@@ -167,10 +155,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Mark a secondary stack, like the register stack on the ia64. */
 #undef GC_MARK_SECONDARY_STACK
 
-/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not
-   known to work. */
-#define GC_MARK_STACK 1
-
 /* Define if setjmp is known to save all registers relevant for conservative
    garbage collection in the jmp_buf.
    MSVC ignores the "register" keyword, so test fails even though
@@ -204,6 +188,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef GNULIB_FACCESSAT
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
+   whether the gnulib module fdopendir shall be considered present. */
+#undef GNULIB_FDOPENDIR
+
+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module fscanf shall be considered present. */
 #undef GNULIB_FSCANF
 
@@ -230,9 +218,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */
 #undef HAVE_AIX_SMT_EXP
 
-/* Define to 1 if you have the `alarm' function. */
-#undef HAVE_ALARM
-
 /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
    may be supplied by this distribution. */
 #undef HAVE_ALLOCA
@@ -268,6 +253,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `copysign' function. */
 #undef HAVE_COPYSIGN
 
+/* Define to 1 if data_start is the address of the start of the main data
+   segment. */
+#undef HAVE_DATA_START
+
 /* Define to 1 if using D-Bus. */
 #undef HAVE_DBUS
 
@@ -289,6 +278,18 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */
 #undef HAVE_DBUS_WATCH_GET_UNIX_FD
 
+/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't.
+   */
+#undef HAVE_DECL_ALARM
+
+/* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FDATASYNC
+
+/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FDOPENDIR
+
 /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
    */
 #define HAVE_DECL_GETENV 1
@@ -297,6 +298,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    don't. */
 #undef HAVE_DECL_LOCALTIME_R
 
+/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MEMRCHR
+
 /* Define to 1 if you have the declaration of `strmode', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRMODE
@@ -325,6 +330,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    */
 #define HAVE_DECL_TZNAME 1
 
+/* Define to 1 if you have the declaration of `unsetenv', and to 0 if you
+   don't. */
+#undef HAVE_DECL_UNSETENV
+
+/* Define to 1 if you have the declaration of `_putenv', and to 0 if you
+   don't. */
+#undef HAVE_DECL__PUTENV
+
 /* Define to 1 if you have the declaration of `__fpending', and to 0 if you
    don't. */
 #undef HAVE_DECL___FPENDING
@@ -342,6 +355,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `difftime' function. */
 #undef HAVE_DIFFTIME
 
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
 /* Define to 1 if you have the 'dup2' function. */
 #define HAVE_DUP2 1
 
@@ -366,6 +382,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `faccessat' function. */
 #undef HAVE_FACCESSAT
 
+/* Define to 1 if you have the `fdatasync' function. */
+#undef HAVE_FDATASYNC
+
+/* Define to 1 if you have the `fdopendir' function. */
+#undef HAVE_FDOPENDIR
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -378,6 +400,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
+/* Define to 1 if you have the `fstatat' function. */
+#undef HAVE_FSTATAT
+
 /* Define to 1 if you have the `fsync' function. */
 #define HAVE_FSYNC 1
 
@@ -484,12 +509,18 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `gtk_file_selection_new' function. */
 #undef HAVE_GTK_FILE_SELECTION_NEW
 
+/* Define to 1 if you have the `gtk_handle_box_new' function. */
+#undef HAVE_GTK_HANDLE_BOX_NEW
+
 /* Define to 1 if you have the `gtk_main' function. */
 #undef HAVE_GTK_MAIN
 
 /* Define to 1 if you have the `gtk_orientable_set_orientation' function. */
 #undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
 
+/* Define to 1 if you have the `gtk_tearoff_menu_item_new' function. */
+#undef HAVE_GTK_TEAROFF_MENU_ITEM_NEW
+
 /* Define to 1 if you have the `gtk_widget_get_mapped' function. */
 #undef HAVE_GTK_WIDGET_GET_MAPPED
 
@@ -520,6 +551,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have inet sockets. */
 #define HAVE_INET_SOCKETS 1
 
+/* Define to 1 to use inotify. */
+#undef HAVE_INOTIFY
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -676,6 +710,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `memrchr' function. */
+#undef HAVE_MEMRCHR
+
 /* Define to 1 if you have mouse menus. (This is automatic if you use X, but
    the option to specify it remains.) It is also defined with other window
    systems that support xmenu.c. */
@@ -687,9 +724,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define if you have mouse support. */
-#define HAVE_MOUSE 1
-
 /* Define to 1 if you have the `nanotime' function. */
 #undef HAVE_NANOTIME
 
@@ -721,6 +755,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <png.h> header file. */
 #undef HAVE_PNG_H
 
+/* Define to 1 if using POSIX ACL support. */
+#define HAVE_POSIX_ACL 1
+
 /* Define to 1 if you have the `posix_memalign' function. */
 #undef HAVE_POSIX_MEMALIGN
 
@@ -793,6 +830,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `shutdown' function. */
 #define HAVE_SHUTDOWN 1
 
+/* Define to 1 if you have the `sig2str' function. */
+#undef HAVE_SIG2STR
+
 /* Define to 1 if 'sig_atomic_t' is a signed integer type. */
 #undef HAVE_SIGNED_SIG_ATOMIC_T
 
@@ -916,6 +956,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <sys/bitypes.h> header file. */
 #undef HAVE_SYS_BITYPES_H
 
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+#undef HAVE_SYS_INOTIFY_H
+
 /* Define to 1 if you have the <sys/inttypes.h> header file. */
 #undef HAVE_SYS_INTTYPES_H
 
@@ -993,6 +1036,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
 /* Define to 1 if the system has the type 'unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -1032,6 +1078,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if `fork' works. */
 #undef HAVE_WORKING_FORK
 
+/* Define to 1 if fstatat (..., 0) works. For example, it does not work in AIX
+   7.1. */
+#undef HAVE_WORKING_FSTATAT_ZERO_FLAG
+
 /* Define if utimes works properly. */
 #undef HAVE_WORKING_UTIMES
 
@@ -1093,7 +1143,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `_ftime' function. */
 #undef HAVE__FTIME
 
-/* Define to 1 if _setjmp and _longjmp work. */
+/* Define to 1 if _setjmp and _longjmp work.  */
 #define HAVE__SETJMP 1
 
 /* Define to 1 if you have the `__builtin_unwind_init' function. */
@@ -1191,9 +1241,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if the nlist n_name member is a pointer */
 #undef N_NAME_POINTER
 
-/* Define if the C compiler is the linker. */
-#define ORDINARY_LINK 1
-
 /* Name of package */
 #define PACKAGE "emacs"
 
@@ -1338,9 +1385,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    timespec. */
 #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
 
-/* Undocumented. */
-#undef ULIMIT_BREAK_VALUE
-
 /* Define to 1 for Encore UMAX. */
 #undef UMAX
 
@@ -1372,6 +1416,38 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if using the Motif X toolkit. */
 #undef USE_MOTIF
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on OS X.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
+   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if we should use toolkit scroll bars. */
 #define USE_TOOLKIT_SCROLL_BARS 1
 
@@ -1397,6 +1473,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Version number of package */
 #define VERSION "24.3.50"
 
+/* Define to 1 if unsetenv returns void instead of int. */
+#undef VOID_UNSETENV
+
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'wchar_t'. */
 #undef WCHAR_T_SUFFIX
@@ -1433,10 +1512,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if the system is AIX. */
 #undef _AIX
 
-/* Enable large inode numbers on Mac OS X.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
+/* Enable large inode numbers on Mac OS X 10.5. */
+#undef _DARWIN_USE_64_BIT_INODE
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
@@ -1457,6 +1534,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define if GNUstep uses ObjC exceptions. */
 #undef _NATIVE_OBJC_EXCEPTIONS
 
+/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
+#undef _NETBSD_SOURCE
+
 /* The _Noreturn keyword of C11.  */
 #if ! (defined _Noreturn \
        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
@@ -1480,35 +1560,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Needed for system_process_attributes on Solaris. */
 #undef _STRUCTURED_PROC
 
-/* Define to 500 only on HP-UX. */
-#undef _XOPEN_SOURCE
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable general extensions on Mac OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
@@ -1529,13 +1580,22 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
      when FOO is an inline function in the header; see
      <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
    _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.  */
-#if (__GNUC__ \
-     ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-     : 199901L <= __STDC_VERSION__)
+     in the same include file, after uses of _GL_INLINE.
+
+   Suppress extern inline with HP-UX cc, as it appears to be broken; see
+   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+   Suppress the use of extern inline on Apple's platforms,
+   as Libc-825.25 (2012-09-19) is incompatible with it; see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   Perhaps Apple will fix this some day.  */
+#if ((__GNUC__ \
+      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      : 199901L <= __STDC_VERSION__ && !defined __HP_cc) \
+     && !defined __APPLE__)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
 # if __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
@@ -1544,8 +1604,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # endif
 # define _GL_EXTERN_INLINE extern
 #else
-# define _GL_INLINE static inline
-# define _GL_EXTERN_INLINE static inline
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
 #endif
 
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
@@ -1573,12 +1633,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to rpl_gmtime if the replacement function should be used. */
 #undef gmtime
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
 /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
diff --git a/nt/configure.bat b/nt/configure.bat
index 3118bb11e5d..f833da72269 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
 @echo off

 rem   ----------------------------------------------------------------------

 rem   Configuration script for MS Windows operating systems

-rem   Copyright (C) 1999-2012  Free Software Foundation, Inc.

+rem   Copyright (C) 1999-2013 Free Software Foundation, Inc.

 

 rem   This file is part of GNU Emacs.

 

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 7648667b4a0..675f0c55985 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,5 +1,5 @@
 /* Simple client interface to DDE servers.
-   Copyright (C) 1998, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 72aa47212ac..d2703c45869 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,5 +1,5 @@
-Emacs ICON   icons\emacs.ico
-32649 CURSOR icons\hand.cur
+Emacs ICON   icons/emacs.ico
+32649 CURSOR icons/hand.cur
 #ifdef WIN64
 1 24 "emacs-x64.manifest"
 #else
@@ -31,7 +31,7 @@ BEGIN
             VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
             VALUE "FileVersion", "24, 3, 50, 0\0"
             VALUE "InternalName", "Emacs\0"
-            VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
+            VALUE "LegalCopyright", "Copyright (C) 2001-2013\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs\0"
             VALUE "ProductVersion", "24, 3, 50, 0\0"
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 59dd7b09f8a..d303e3451d0 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -25,7 +25,7 @@ BEGIN
             VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
             VALUE "FileVersion", "24, 3, 50, 0\0"
             VALUE "InternalName", "EmacsClient\0"
-            VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
+            VALUE "LegalCopyright", "Copyright (C) 2001-2013\0"
             VALUE "OriginalFilename", "emacsclientw.exe"
             VALUE "ProductName", "EmacsClient\0"
             VALUE "ProductVersion", "24, 3, 50, 0\0"
diff --git a/nt/envadd.bat b/nt/envadd.bat
index cca44d9ea97..bcb9b6fabe1 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,7 +1,7 @@
 rem  Hack to change/add environment variables in the makefiles for the

 rem  Windows platform.

 

-rem Copyright (C) 2003-2012  Free Software Foundation, Inc.

+rem Copyright (C) 2003-2013 Free Software Foundation, Inc.

 

 rem  This file is part of GNU Emacs.

 

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 3d545fab975..6d55cdcc84a 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/nt/icons/README b/nt/icons/README
index a3acb66178c..d77b81de9c2 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -2,13 +2,13 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 File: emacs.ico
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2008-2012  Free Software Foundation, Inc.
+Copyright (C) 2008-2013 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later
 
 
 File: emacs22.ico
 Author: Andrew Zhilin
-Copyright (C) 2005-2012  Free Software Foundation, Inc.
+Copyright (C) 2005-2013 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
@@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
        gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
        gnu7.ico    gnu8.ico     gnu9.ico
 Author: Rob Davenport <rgd at bigfoot.com>
-Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   <http://users.adelphia.net/~rob.davenport/gnuicons.html>
diff --git a/nt/inc/dirent.h b/nt/inc/dirent.h
index 618f3beddf0..676b82d207b 100644
--- a/nt/inc/dirent.h
+++ b/nt/inc/dirent.h
@@ -30,7 +30,7 @@ typedef struct
         char    dd_buf[DIRBLKSIZ];      /* directory block */
         }       DIR;                    /* stream data from opendir() */
 
-extern DIR              *opendir (char *);
+extern DIR              *opendir (const char *);
 extern struct dirent    *readdir (DIR *);
 extern void             seekdir (DIR *, long);
 extern void             closedir (DIR *);
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 3d369044974..02c0ef7f3a0 100644
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,6 +1,6 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2003-2012  Free Software Foundation, Inc.
+Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 688b9bc9223..4629ccb038c 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -1,6 +1,6 @@
 /* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC.
 
-Copyright (C) 2011-2012  Free Software Foundation, Inc.
+Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 7ab36f0a998..93a56e548c7 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,6 +1,6 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2006-2012  Free Software Foundation, Inc.
+Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 7b16ccab069..cd183c917c4 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -1,6 +1,6 @@
 /* System description file for Windows NT.
 
-Copyright (C) 1993-1995, 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -70,6 +70,18 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE___BUILTIN_UNWIND_INIT 1
 #endif
 
+/* This isn't perfect, as some systems might have the page file in
+   another place.  Also, I suspect that the time stamp of that file
+   might also change when Windows enlarges the file due to
+   insufficient VM.  Still, this seems to be the most reliable way;
+   the alternative (of using GetSystemTimes) won't work on laptops
+   that hibernate, because the system clock is stopped then.  Other
+   possibility would be to run "net statistics workstation" and parse
+   the output, but that's gross.  So this should do; if the file is
+   not there, the boot time will be returned as zero, and filelock.c
+   already handles that.  */
+#define BOOT_TIME_FILE "C:/pagefile.sys"
+
 /* ============================================================ */
 
 /* Here, add any special hacks needed to make Emacs work on this
@@ -115,6 +127,17 @@ typedef unsigned short mode_t;
 extern char *getenv ();
 #endif
 
+/* Prevent accidental use of features unavailable in older Windows
+   versions we still support.  MinGW64 defines this to a higher value
+   in its system headers, and is not really compatible with values
+   lower than 0x0500, so leave it alone.  */
+#ifndef _W64
+# define _WIN32_WINNT 0x0400
+#endif
+
+/* Make a leaner executable.  */
+#define WIN32_LEAN_AND_MEAN 1
+
 #ifdef HAVE_STRINGS_H
 #include "strings.h"
 #endif
@@ -133,6 +156,21 @@ extern char *getenv ();
 
 #ifdef emacs
 
+#ifdef _W64
+/* MinGW64 specific stuff.  */
+/* Make sure 'struct timespec' and 'struct timezone' are defined.  */
+#include <sys/types.h>
+#include <time.h>
+/* This prototype avoids MinGW64 compiler warnings due to the fact
+   that time.h is included before localtime is redirected to
+   sys_localtime below.  */
+extern struct tm * sys_localtime (const time_t *);
+/* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to
+   supply the 2nd arg correctly, so don't use _setjmp directly in that
+   case. */
+#undef HAVE__SETJMP
+#endif
+
 #ifdef _MSC_VER
 #include <sys/timeb.h>
 #include <sys/stat.h>
@@ -149,7 +187,6 @@ extern char *getenv ();
 #define chdir   sys_chdir
 #undef chmod
 #define chmod   sys_chmod
-#define chown   sys_chown
 #undef close
 #define close   sys_close
 #undef creat
@@ -178,6 +215,10 @@ extern char *getenv ();
 #define strerror sys_strerror
 #undef unlink
 #define unlink  sys_unlink
+/* This prototype is needed because some files include config.h
+   _after_ the standard headers, so sys_unlink gets no prototype from
+   stdio.h or io.h.  */
+extern int sys_unlink (const char *);
 #undef write
 #define write   sys_write
 
@@ -205,6 +246,7 @@ extern char *getenv ();
 /* Map to MSVC names.  */
 #define execlp    _execlp
 #define execvp    _execvp
+#define fdatasync _commit
 #define fdopen    _fdopen
 #ifndef fileno
 #define fileno    _fileno
@@ -218,7 +260,6 @@ typedef int pid_t;
 #define strtoll   _strtoi64
 #endif
 #define isatty    _isatty
-#define logb      _logb
 #define _longjmp  longjmp
 #define lseek     _lseek
 #define popen     _popen
@@ -251,18 +292,24 @@ int _getpid (void);
 /* 'struct timespec' is used by time-related functions in lib/ and
    elsewhere, but we don't use lib/time.h where the structure is
    defined.  */
+/* MinGW64 defines 'struct timespec' and _TIMESPEC_DEFINED in sys/types.h.  */
+#ifndef _TIMESPEC_DEFINED
 struct timespec
 {
   time_t        tv_sec;         /* seconds */
   long int      tv_nsec;        /* nanoseconds */
 };
+#endif
 
 /* Required for functions in lib/time_r.c, since we don't use lib/time.h.  */
 extern struct tm *gmtime_r (time_t const * restrict, struct tm * restrict);
 extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict);
 
+#ifdef _MSC_VER
 /* This is hacky, but is necessary to avoid warnings about macro
-   redefinitions using the SDK compilers.  */
+   redefinitions using the MSVC compilers, since, when __STDC__ is
+   undefined or zero, those compilers declare functions like fileno,
+   lseek, and chdir, for which we defined macros above.  */
 #ifndef __STDC__
 #define __STDC__ 1
 #define MUST_UNDEF__STDC__
@@ -274,6 +321,11 @@ extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict);
 #undef __STDC__
 #undef MUST_UNDEF__STDC__
 #endif
+#else  /* !_MSC_VER */
+#include <direct.h>
+#include <io.h>
+#include <stdio.h>
+#endif  /* !_MSC_VER */
 
 /* Defines that we need that aren't in the standard signal.h.  */
 #define SIGHUP  1               /* Hang up */
@@ -289,11 +341,19 @@ extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict);
 #define NSIG 23
 #endif
 
+#ifndef ENOTSUP
+#define ENOTSUP ENOSYS
+#endif
+
 #ifdef _MSC_VER
 typedef int sigset_t;
 typedef int ssize_t;
 #endif
 
+#ifndef _POSIX  /* MinGW64 */
+typedef _sigset_t sigset_t;
+#endif
+
 typedef void (_CALLBACK_ *signal_handler) (int);
 extern signal_handler sys_signal (int, signal_handler);
 
@@ -339,13 +399,6 @@ extern char *get_emacs_configuration_options (void);
 #define _WINSOCKAPI_    1
 #define _WINSOCK_H
 
-/* Prevent accidental use of features unavailable in
-   older Windows versions we still support.  */
-#define _WIN32_WINNT 0x0400
-
-/* Make a leaner executable.  */
-#define WIN32_LEAN_AND_MEAN 1
-
 /* Defines size_t and alloca ().  */
 #ifdef emacs
 #define malloc e_malloc
@@ -376,9 +429,19 @@ extern char *get_emacs_configuration_options (void);
 #define sys_nerr _sys_nerr
 #endif
 
+/* This must be after including stdlib.h, which defines putenv on MinGW.  */
+#ifdef putenv
+# undef putenv
+#endif
+#define putenv    sys_putenv
+extern int sys_putenv (char *);
+
 extern int getloadavg (double *, int);
 extern int getpagesize (void);
 
+extern void * memrchr (void const *, int, size_t);
+
+
 #if defined (__MINGW32__)
 
 /* Define to 1 if the system has the type `long long int'. */
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index 3d3a162bada..e3eb9eb5477 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,6 +1,6 @@
 /* Replacement nl_types.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2006-2012 Free Software Foundation, Inc.
+Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index 97c9bbdaee9..c8b3aba0916 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -1,6 +1,6 @@
 /* Replacement stdint.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2011-2012  Free Software Foundation, Inc.
+Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -38,6 +38,7 @@ typedef unsigned __int64 uint64_t;
 #define INT64_MIN (~INT64_MAX)
 #define INTPTR_MAX INT64_MAX
 #define INTPTR_MIN INT64_MIN
+#define UINTPTR_MAX UINT64_MAX
 #define UINTMAX_MAX UINT64_MAX
 #define UINTMAX_MIN UINT64_MIN
 #define INTMAX_MAX INT64_MAX
@@ -53,6 +54,7 @@ typedef unsigned int uint32_t;
 #define INT32_MIN (~INT32_MAX)
 #define INTPTR_MAX INT32_MAX
 #define INTPTR_MIN INT32_MIN
+#define UINTPTR_MAX UINT32_MAX
 #define UINTMAX_MAX UINT32_MAX
 #define UINTMAX_MIN UINT32_MIN
 #define INTMAX_MAX INT32_MAX
diff --git a/nt/inc/sys/acl.h b/nt/inc/sys/acl.h
new file mode 100644
index 00000000000..3133e3bfc09
--- /dev/null
+++ b/nt/inc/sys/acl.h
@@ -0,0 +1,25 @@
+/* Emulation of Posix ACLs for Windows.  */
+
+#ifndef ACL_H
+#define ACL_H
+
+#define NOMINMAX 1      /* don't define min and max */
+#include <windows.h>
+
+typedef PSECURITY_DESCRIPTOR acl_t;
+typedef unsigned acl_type_t;
+
+/* Values of acl_type_t  */
+#define ACL_TYPE_ACCESS  0
+#define ACL_TYPE_DEFAULT 1
+
+typedef unsigned acl_perm_t;
+
+extern int    acl_valid (acl_t);
+extern acl_t  acl_get_file (const char *, acl_type_t);
+extern int    acl_set_file (const char *, acl_type_t, acl_t);
+extern char * acl_to_text (acl_t, ssize_t *);
+extern acl_t  acl_from_text (const char *);
+extern int    acl_free (void *);
+
+#endif  /* ACL_H */
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 1c8be6c452f..99227d75d28 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index b673b80a0e3..f6785c56477 100644
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -1,7 +1,7 @@
 /* sys/stat.h supplied with MSVCRT uses too narrow data types for
    inode and user/group id, so we replace them with our own.
 
-Copyright (C) 2008-2012  Free Software Foundation, Inc.
+Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -74,6 +74,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define S_ISDOOR(m)    0
 #define S_ISMPB(m)     0
 #define S_ISMPC(m)     0
+#define S_ISMPX(m)     0
 #define S_ISNWK(m)     0
 #define S_ISPORT(m)    0
 #define S_ISWHT(m)     0
@@ -98,13 +99,18 @@ struct stat {
   char             st_gname[260];
 };
 
+/* Internal variable for asking 'stat'/'lstat' to produce accurate
+   info about owner and group of files. */
+extern int w32_stat_get_owner_group;
+
 /* Prevent redefinition by other headers, e.g. wchar.h.  */
 #define _STAT_DEFINED
 
-_CRTIMP int __cdecl __MINGW_NOTHROW     fstat (int, struct stat*);
-_CRTIMP int __cdecl __MINGW_NOTHROW     chmod (const char*, int);
-_CRTIMP int __cdecl __MINGW_NOTHROW     stat (const char*, struct stat*);
-_CRTIMP int __cdecl __MINGW_NOTHROW     lstat (const char*, struct stat*);
+int __cdecl __MINGW_NOTHROW     fstat (int, struct stat*);
+int __cdecl __MINGW_NOTHROW     stat (const char*, struct stat*);
+int __cdecl __MINGW_NOTHROW     lstat (const char*, struct stat*);
+int __cdecl __MINGW_NOTHROW     fstatat (int, char const *,
+                                                 struct stat *, int);
+int __cdecl __MINGW_NOTHROW     chmod (const char*, int);
 
 #endif  /* INC_SYS_STAT_H_ */
-
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index 2d2c3abe222..aa51041bcd8 100644
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -6,6 +6,9 @@
  * have the below stuff.
  */
 
+/* The guards are for MinGW64, which defines these structs on its
+   system headers which are included by ms-w32.h.  */
+#ifndef _W64
 /* Allow inclusion of sys/time.h and winsock2.h in any order.  Needed
    for running the configure test, which is only relevant to MinGW.  */
 #ifndef _TIMEVAL_DEFINED
@@ -22,12 +25,15 @@ struct timeval
         ((tvp)->tv_usec cmp (uvp)->tv_usec))
 #define timerclear(tvp)  (tvp)->tv_sec = (tvp)->tv_usec = 0
 #endif /* _TIMEVAL_DEFINED */
+#endif /* _W64 */
 
+#ifndef _TIMEZONE_DEFINED
 struct timezone
 {
   int           tz_minuteswest; /* minutes west of Greenwich */
   int           tz_dsttime;     /* type of dst correction */
 };
+#endif
 
 void gettimeofday (struct timeval *, struct timezone *);
 
diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h
index 8d890c9e175..d192453ff57 100644
--- a/nt/inc/sys/wait.h
+++ b/nt/inc/sys/wait.h
@@ -1,6 +1,6 @@
 /* A limited emulation of sys/wait.h on Posix systems.
 
-Copyright (C) 2012  Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index b75e7d7d6bf..8ad8cf213b1 100644
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -15,6 +15,7 @@
    and whose prototypes are usually found in unistd.h on POSIX
    platforms.  */
 extern ssize_t readlink (const char *, char *, size_t);
+extern ssize_t readlinkat (int, const char *, char *, size_t);
 extern int symlink (char const *, char const *);
 extern int setpgid (pid_t, pid_t);
 extern pid_t getpgrp (void);
@@ -29,6 +30,11 @@ extern int faccessat (int, char const *, int, int);
 #define AT_EACCESS 4
 #define AT_SYMLINK_NOFOLLOW 4096
 
+#define O_IGNORE_CTTY 0
 #define O_NOCTTY 0
+#define O_NOFOLLOW 0
+
+/* This is normally on stdlib.h, but we don't override that header.  */
+extern int unsetenv (const char *);
 
 #endif  /* _UNISTD_H */
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 7377d7e33b9..d3e1c8e2228 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 #
 # Top level makefile for building GNU Emacs on Windows NT
 #
@@ -31,33 +31,26 @@ CLIENTRES	= $(BLD)/emacsclient.res
 
 XMFLAGS         =
 
-ALL             = addpm ddeclient runemacs cmdproxy addsection preprep
+ALL             = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \
+                  $(BLD)/cmdproxy.exe $(BLD)/addsection.exe $(BLD)/preprep.exe
 
-.PHONY: $(ALL)
-
-
-addpm:            stamp_BLD $(BLD)/addpm.exe
 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \
                   $(USER32) $(OLE32) $(UUID) $(SHELL32)
 
-ddeclient:        stamp_BLD $(BLD)/ddeclient.exe
 $(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
 
-cmdproxy:         stamp_BLD $(BLD)/cmdproxy.exe
 $(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
 
-addsection:       stamp_BLD $(BLD)/addsection.exe
 $(BLD)/addsection.exe: $(BLD)/addsection.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
 
-preprep:          stamp_BLD $(BLD)/preprep.exe
 $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
                   $(LINK) $(LINK_OUT)$@ \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
@@ -72,7 +65,6 @@ $(TRES):	emacs.rc icons/emacs.ico $(EMACS_MANIFEST) stamp_BLD
 $(CLIENTRES):   emacsclient.rc stamp_BLD
                 $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
 
-runemacs:         stamp_BLD $(BLD)/runemacs.exe
 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
                   $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
                   $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
@@ -93,7 +85,7 @@ all:	which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
 
 all-other-dirs-$(MAKETYPE): maybe-bootstrap
 
-all-other-dirs-nmake: addsection
+all-other-dirs-nmake: $(BLD)/addsection.exe
         cd ..\lib
         $(MAKE) $(MFLAGS) all
         cd ..\lib-src
@@ -106,7 +98,7 @@ all-other-dirs-nmake: addsection
         $(MAKE) $(MFLAGS) all
         cd ..\nt
 
-all-other-dirs-gmake: addsection
+all-other-dirs-gmake: $(BLD)/addsection.exe
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
@@ -153,10 +145,10 @@ maybe-bootstrap-SH: doit
 
 # Bootstrap depends on cmdproxy because some Lisp functions
 # loaded during bootstrap may need to run shell commands.
-bootstrap:      addsection cmdproxy bootstrap-$(MAKETYPE)
+bootstrap:      $(BLD)/addsection.exe $(BLD)/cmdproxy.exe bootstrap-$(MAKETYPE)
         $(MAKE) $(MFLAGS) $(XMFLAGS) all
 
-bootstrap-nmake: addsection cmdproxy
+bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
         cd ..\lisp
         $(MAKE) $(MFLAGS) bootstrap-clean
         cd ..\src
@@ -176,7 +168,7 @@ bootstrap-nmake: addsection cmdproxy
         $(MAKE) $(MFLAGS) DOC
         cd ..\nt
 
-bootstrap-gmake: addsection cmdproxy
+bootstrap-gmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
@@ -257,7 +249,7 @@ install-other-dirs-gmake: all
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
 
-install-addpm: $(INSTALL_DIR)/bin addpm
+install-addpm: $(INSTALL_DIR)/bin $(BLD)/addpm.exe
         - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
 
 install-shortcuts: install-addpm
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 0fff904c60e..9bb723a4d89 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -3,7 +3,7 @@
 rem  Hack to run install-info with multiple info files on the command

 rem  line on the Windows platform.

 

-rem Copyright (C) 2003-2012  Free Software Foundation, Inc.

+rem Copyright (C) 2003-2013 Free Software Foundation, Inc.

 

 rem  This file is part of GNU Emacs.

 

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 2c6bc66b673..04a3f1660a8 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.

-# Copyright (C) 2000-2012 Free Software Foundation, Inc.

+# Copyright (C) 2000-2013 Free Software Foundation, Inc.

 

 # This file is part of GNU Emacs.

 

@@ -117,7 +117,7 @@ RC_INCLUDE	= -i
 

 USE_CRT_DLL     = 1

 

-!if USE_CRT_DLL

+!if $(USE_CRT_DLL)

 libc            = msvcrt$(D).lib

 EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1

 !else

diff --git a/nt/paths.h b/nt/paths.h
index 801d187646f..e9601a7ce32 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,7 +1,7 @@
 /* paths.h file for MS Windows
 
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2012
-  Free Software Foundation, Inc.
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software
+Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/preprep.c b/nt/preprep.c
index 6976567e038..42855ce7f20 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,5 +1,5 @@
 /* Pre-process emacs.exe for profiling by MSVC.
-   Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif
diff --git a/nt/runemacs.c b/nt/runemacs.c
index dbb18bcd82c..b090ffdd639 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,6 +1,6 @@
 /* runemacs --- Simple program to start Emacs with its console window hidden.
 
-Copyright (C) 2001-2012  Free Software Foundation, Inc.
+Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index e196299b6d6..2953e40ae89 100644
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -1,5 +1,5 @@
 @echo off

-rem Copyright (C) 2001-2012  Free Software Foundation, Inc.

+rem Copyright (C) 2001-2013 Free Software Foundation, Inc.

 

 rem Author: Christoph Scholtes cschol2112 at gmail.com