Our three branches (branch-1.4, branch-1.6, and master [eventually 2.0]) are woefully out of sync. Over the next few days, according to how much spare time I can manage, I am going to try and cherry pick various patches to bring the changes to the stable branches into master (to make sure we don't regress), as well as to update as much as I can from branch-1.4 into branch-1.6 (I'd really like to make the next release be 1.6.0, and ditch branch-1.4 entirely).
This represents as far as I got today. Eric Blake (6): maint: bump copyright year maint: kill trailing spaces doc: drop obsolete @setcontentsaftertitlepage maint: release no longer creates a diff file maint: make silent builds the default maint: summarize highlights of 1.4.18 release Gary V. Vaughan (1): maint: automake 1.11.5 and earlier generate insecure dist rules. .gitignore | 1 + .prev-version | 2 +- AUTHORS | 4 ++-- COPYING | 2 +- ChangeLog.old | 4 ++-- HACKING | 10 +++------- Makefile.am | 2 +- NEWS | 13 +++++++++++-- NO-THANKS | 14 +++++++------- README | 3 ++- README-alpha | 3 ++- TODO | 2 +- bootstrap | 8 ++++---- bootstrap.conf | 5 +++-- build-aux/gl/build-aux/bootstrap.in | 2 +- build-aux/gl/build-aux/extract-trace | 2 +- build-aux/gl/build-aux/funclib.sh | 2 +- build-aux/gl/build-aux/inline-source | 2 +- build-aux/gl/build-aux/options-parser | 2 +- build-aux/gnulib | 2 +- build-aux/m4/debug.m4 | 2 +- build-aux/m4/gmp.m4 | 2 +- build-aux/m4/gnulib-cache.m4 | 4 ++-- build-aux/m4/m4-error.m4 | 4 ++-- build-aux/m4/m4-getopt.m4 | 2 +- build-aux/m4/m4-gettext.m4 | 4 ++-- build-aux/m4/m4-obstack.m4 | 4 ++-- build-aux/m4/m4-regex.m4 | 4 ++-- build-aux/m4/m4-rename.m4 | 3 ++- build-aux/m4/m4-syscmd.m4 | 3 ++- build-aux/m4/stackovf.m4 | 4 ++-- cfg.mk | 8 ++++++-- configure.ac | 6 +++--- doc/Makefile.am | 2 +- doc/STYLE | 3 ++- doc/examples/COPYING | 2 +- doc/examples/WWW/COPYING | 2 +- doc/examples/WWW/m4lib/COPYING | 2 +- doc/examples/modtest.m4 | 3 ++- doc/examples/shadow.m4 | 3 ++- doc/examples/stdlib.m4 | 3 ++- doc/examples/time.m4 | 3 ++- doc/examples/time2.m4 | 3 ++- doc/m4.texi | 7 ++----- m4/builtin.c | 4 ++-- m4/debug.c | 2 +- m4/hash.c | 4 ++-- m4/hash.h | 2 +- m4/input.c | 2 +- m4/m4.c | 4 ++-- m4/m4module.h | 2 +- m4/m4private.h | 2 +- m4/macro.c | 4 ++-- m4/module.c | 6 +++--- m4/output.c | 4 ++-- m4/path.c | 4 ++-- m4/resyntax.c | 4 ++-- m4/symtab.c | 2 +- m4/syntax.c | 2 +- m4/system_.h | 2 +- m4/utility.c | 4 ++-- modules/README | 4 ++-- modules/evalparse.c | 4 ++-- modules/format.c | 4 ++-- modules/gnu.c | 4 ++-- modules/m4.c | 4 ++-- modules/m4.h | 2 +- modules/mpeval.c | 4 ++-- modules/stdlib.c | 2 +- modules/time.c | 2 +- modules/traditional.c | 2 +- po/Makevars | 2 +- src/freeze.c | 2 +- src/m4.h | 4 ++-- src/main.c | 2 +- src/stackovf.c | 4 ++-- tests/atlocal.in | 4 ++-- tests/builtins.at | 4 ++-- tests/freeze.at | 3 ++- tests/generate.awk | 4 ++-- tests/import.c | 2 +- tests/iso8859.m4 | 4 ++-- tests/m4.in | 4 ++-- tests/macros.at | 2 +- tests/modtest.c | 4 ++-- tests/modules.at | 2 +- tests/options.at | 4 ++-- tests/others.at | 4 ++-- tests/shadow.c | 4 ++-- tests/stackovf.test | 2 +- tests/testsuite.at | 4 ++-- 91 files changed, 169 insertions(+), 150 deletions(-) -- 2.9.3 _______________________________________________ M4-patches mailing list [email protected] https://lists.gnu.org/mailman/listinfo/m4-patches
