emacs/nt/inc, branch feature/new-tutorial Emacs is the extensible, customizable, self-documenting real-time display editor. ; Remove redundant definition of the 'DebPrint' macro 2017-05-04T15:11:53+00:00 Eli Zaretskii 2017-05-04T15:11:53+00:00 53348c6b9ffa46c15ec04ff08ffb6ec742c86ea4 * nt/inc/ms-w32.h (DebPrint): Remove redundant definition (defined in src/conf_post.h). 
* nt/inc/ms-w32.h (DebPrint): Remove redundant definition (defined
in src/conf_post.h).
Temporary fix for the MS_Windows build 2017-05-02T06:24:25+00:00 Eli Zaretskii 2017-05-02T06:24:25+00:00 b7c5af2bbda9f972b659389b061ef4c09bfba796 * nt/inc/ms-w32.h (WIN32_LEAN_AND_MEAN): Define to an empty value, to be consistent with Gnulib's utimens.c. This is because utimens.c unconditionally defines WIN32_LEAN_AND_MEAN to an empty value, so the previous definition here conflicted with that. 
* nt/inc/ms-w32.h (WIN32_LEAN_AND_MEAN): Define to an empty value,
to be consistent with Gnulib's utimens.c.  This is because utimens.c
unconditionally defines WIN32_LEAN_AND_MEAN to an empty value, so the
previous definition here conflicted with that.
Update copyright year to 2017 in master 2017-01-01T09:48:59+00:00 Paul Eggert 2017-01-01T09:48:38+00:00 e6a782ee1af7e9d2fe52c3a8cddaf7f02c1ad150 Run admin/update-copyright in the master branch. This fixes files that were not already fixed in the emacs-25 branch before it was merged here. 
Run admin/update-copyright in the master branch.  This fixes files
that were not already fixed in the emacs-25 branch before it was
merged here.
Merge from origin/emacs-25 2017-01-01T09:10:47+00:00 Paul Eggert 2017-01-01T09:10:47+00:00 bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Update copyright year to 2017 2017-01-01T03:42:26+00:00 Paul Eggert 2017-01-01T03:14:01+00:00 5badc81c1cdfbb261ad3e6d1b753defb15712f26 Run admin/update-copyright. 
Run admin/update-copyright.
Merge branch 'concurrency' 2016-12-04T17:59:17+00:00 Eli Zaretskii 2016-12-04T17:59:17+00:00 de4624c99ea5bbe38ad5aff7b6461cc5c740d0be Conflicts (resolved): configure.ac src/Makefile.in src/alloc.c src/bytecode.c src/emacs.c src/eval.c src/lisp.h src/process.c src/regex.c src/regex.h 
Conflicts (resolved):
	configure.ac
	src/Makefile.in
	src/alloc.c
	src/bytecode.c
	src/emacs.c
	src/eval.c
	src/lisp.h
	src/process.c
	src/regex.c
	src/regex.h
Implement getrlimit and setrlimit for MS-Windows 2016-11-19T10:17:23+00:00 Eli Zaretskii 2016-11-19T10:17:23+00:00 4cdd14eabe5a6121691daa2d9c5e814c5f53f3e5 * src/w32heap.c (getrlimit, setrlimit): New functions. Include w32.h. * src/emacs.c (main): Use 'rlim_t', not 'long', for values that should be compatible with 'struct rlimit' members. * nt/inc/sys/resource.h: New header file. * nt/mingw-cfg.site (ac_cv_func_getrlimit, ac_cv_func_setrlimit): Set to "yes". 
* src/w32heap.c (getrlimit, setrlimit): New functions.
Include w32.h.
* src/emacs.c (main): Use 'rlim_t', not 'long', for values that
should be compatible with 'struct rlimit' members.

* nt/inc/sys/resource.h: New header file.

* nt/mingw-cfg.site (ac_cv_func_getrlimit, ac_cv_func_setrlimit):
Set to "yes".
Fix compilation with MinGW runtime 3.22.2 and w32api 3.18.2 2016-10-06T15:11:43+00:00 Eli Zaretskii 2016-10-06T15:11:43+00:00 d48369db9c97b6f2accf702e5bbe0bda11cb92a1 * nt/inc/ms-w32.h (_WIN32_WINNT) [!MINGW_W64]: Undefine before defining to avoid redefinition warnings. * nt/inc/sys/stat.h (_SYS_STAT_H, _INC_STAT_H): Define, to avoid inclusion of sys/stat.h from the system headers, which could then lead to compilation errors due to redefinition of 'struct stat' etc. This is needed because latest versions of MinGW runtime include sys/stat.h from wchar.h. * src/image.c (__MINGW_MAJOR_VERSION) [WINDOWSNT]: Temporarily redefine to 4 to avoid conflict between 2 definitions of MemoryBarrier. (Bug#24613) 
* nt/inc/ms-w32.h (_WIN32_WINNT) [!MINGW_W64]: Undefine before
defining to avoid redefinition warnings.

* nt/inc/sys/stat.h (_SYS_STAT_H, _INC_STAT_H): Define, to avoid
inclusion of sys/stat.h from the system headers, which could then
lead to compilation errors due to redefinition of 'struct stat'
etc.  This is needed because latest versions of MinGW runtime
include sys/stat.h from wchar.h.

* src/image.c (__MINGW_MAJOR_VERSION) [WINDOWSNT]: Temporarily
redefine to 4 to avoid conflict between 2 definitions of
MemoryBarrier.  (Bug#24613)
Fix compilation with MinGW runtime 3.22.2 and w32api 3.18.2 2016-10-06T15:08:31+00:00 Eli Zaretskii 2016-10-06T15:08:31+00:00 34b6df19a4dafe0227ab663c971079e68e17f393 * nt/inc/ms-w32.h (_WIN32_WINNT) [!MINGW_W64]: Undefine before defining to avoid redefinition warnings. * nt/inc/sys/stat.h (_SYS_STAT_H, _INC_STAT_H): Define, to avoid inclusion of sys/stat.h from the system headers, which could then lead to compilation errors due to redefinition of 'struct stat' etc. This is needed because latest versions of MinGW runtime include sys/stat.h from wchar.h. * src/image.c (__MINGW_MAJOR_VERSION) [WINDOWSNT]: Temporarily redefine to 4 to avoid conflict between 2 definitions of MemoryBarrier. (Bug#24613) Do not merge to master! 
* nt/inc/ms-w32.h (_WIN32_WINNT) [!MINGW_W64]: Undefine before
defining to avoid redefinition warnings.

* nt/inc/sys/stat.h (_SYS_STAT_H, _INC_STAT_H): Define, to avoid
inclusion of sys/stat.h from the system headers, which could then
lead to compilation errors due to redefinition of 'struct stat'
etc.  This is needed because latest versions of MinGW runtime
include sys/stat.h from wchar.h.

* src/image.c (__MINGW_MAJOR_VERSION) [WINDOWSNT]: Temporarily
redefine to 4 to avoid conflict between 2 definitions of
MemoryBarrier.  (Bug#24613)

Do not merge to master!
* nt/inc/ms-w32.h (execve) [MINGW_W64]: Make commentary more accurate. 2016-09-01T17:15:25+00:00 Eli Zaretskii 2016-09-01T17:15:25+00:00 0c94b847082bf915137c4270b8009ad599681ccf