emacs/nt, branch comment-cache Emacs is the extensible, customizable, self-documenting real-time display editor. Yet another fix for autogen.sh 2017-01-05T19:36:58+00:00 Eli Zaretskii 2017-01-05T19:36:58+00:00 ade6a024c80dbb0b66d9d2e10ccd350618036e78 * autogen.sh (gnulib.mk): Make the Sed script more portable. * nt/Makefile.in (${srcdir}/gnulib.mk): Adapt the Sed command to the changes in autogen.sh. 
* autogen.sh (gnulib.mk): Make the Sed script more portable.

* nt/Makefile.in (${srcdir}/gnulib.mk): Adapt the Sed command to
the changes in autogen.sh.
Generate nt/gnulib.mk from lib/gnulib.mk 2017-01-03T15:46:40+00:00 Eli Zaretskii 2017-01-03T15:46:40+00:00 10444dcf77711bf3360f865fcb0d446a83e1bfb5 This was proposed by Paul Eggert <eggert@cs.ucla.edu>, with the purpose of avoiding manual maintenance of nt/gnulib.mk. * nt/gnulib-modules-to-delete.cfg: New file. * nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0) (am__v_GEN_1): New variables. (${srcdir}/gnulib.mk): Rules to generate gnulib.mk from lib/gnulib.mk and list of modules in gnulib-modules-to-delete.cfg. * make-dist (nt): Add gnulib-modules-to-delete.cfg to the list of files to link. * configure.ac (GNULIB_MK): Compute the value according to $opsys. * autogen.sh: Create nt/gnulib.mk if it doesn't exist, before running autoreconf. * Makefile.in (gnulib_mk): New variable. ($(srcdir)/nt/gnulib.mk): Rule to produce it. (AUTOMAKE_INPUTS): Use $(gnulib_mk) instead of a literal file name. * .gitignore: Add nt/gnulib.mk. * src/w32.c (acl_errno_valid): Implement it here, as we no longer build the acl-permissions module from Gnulib. 
This was proposed by Paul Eggert <eggert@cs.ucla.edu>,
with the purpose of avoiding manual maintenance of
nt/gnulib.mk.

* nt/gnulib-modules-to-delete.cfg: New file.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1): New variables.
(${srcdir}/gnulib.mk): Rules to generate gnulib.mk from
lib/gnulib.mk and list of modules in gnulib-modules-to-delete.cfg.

* make-dist (nt): Add gnulib-modules-to-delete.cfg to the list of
files to link.
* configure.ac (GNULIB_MK): Compute the value according to $opsys.
* autogen.sh: Create nt/gnulib.mk if it doesn't exist, before
running autoreconf.
* Makefile.in (gnulib_mk): New variable.
($(srcdir)/nt/gnulib.mk): Rule to produce it.
(AUTOMAKE_INPUTS): Use $(gnulib_mk) instead of a literal file
name.
* .gitignore: Add nt/gnulib.mk.

* src/w32.c (acl_errno_valid): Implement it here, as we no longer
build the acl-permissions module from Gnulib.
* nt/gnulib.mk (stdint.h): Update to match lib/gnulib.mk here. 2017-01-01T18:55:10+00:00 Paul Eggert 2017-01-01T18:54:28+00:00 eb3416016b473478df027ab176f512d7136f8d45 






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







Fix copyright years by hand
2017-01-01T04:01:41+00:00

Paul Eggert

2017-01-01T04:01:41+00:00

2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0

These are dates that admin/update-copyright did not update, or
updated incorrectly.





These are dates that admin/update-copyright did not update, or
updated incorrectly.







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.







Bump Emacs version to 25.1.91
2016-12-30T14:38:03+00:00

Nicolas Petton

2016-12-30T14:38:03+00:00

e092f08515af5e523a85ce0624e36da61fba65bd

* README:
* configure.ac:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version.
* lisp/ldefs-boot.el: Update.





* README:
* configure.ac:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version.
* lisp/ldefs-boot.el: Update.







Merge from gnulib
2016-12-15T20:19:45+00:00

Paul Eggert

2016-12-15T20:18:28+00:00

5942af614133000a42b3b11f963a30c2b987272e

This incorporates:
2016-12-14 xalloc-oversized: check for PTRDIFF_MAX too
2016-12-12 fpending: port to native Windows with MSVC
* .gitignore: Do not ignore lib/stdio-impl.h.
* lib/fpending.c, lib/xalloc-oversized.h, m4/fpending.m4:
Copy from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdio-impl.h:
New file, copied from gnulib.
* nt/gnulib.mk (EXTRA_DIST): Add stdio-impl.h.





This incorporates:
2016-12-14 xalloc-oversized: check for PTRDIFF_MAX too
2016-12-12 fpending: port to native Windows with MSVC
* .gitignore: Do not ignore lib/stdio-impl.h.
* lib/fpending.c, lib/xalloc-oversized.h, m4/fpending.m4:
Copy from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdio-impl.h:
New file, copied from gnulib.
* nt/gnulib.mk (EXTRA_DIST): Add stdio-impl.h.







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