Merge branch 'master' into pucked.

diff --cc .gitignore
Simple merge

diff --cc dist/make-src-files
Simple merge

diff --cc dist/shared.sh
Simple merge

diff --cc doc/Makefile.in
Simple merge

diff --cc doc/configure.ac
Simple merge

diff --cc doc/ffi/ffi.texinfo
Simple merge

diff --cc doc/make-common.in
Simple merge

diff --cc doc/ref-manual/Makefile.in
Simple merge

diff --cc doc/ref-manual/scheme.texinfo
Simple merge

diff --cc doc/sos/Makefile.in
Simple merge

diff --cc doc/sos/sos.texinfo
Simple merge

diff --cc doc/user-manual/Makefile.in
Simple merge

diff --cc doc/user-manual/user.texinfo
Simple merge

diff --cc src/Makefile.in
index 69e6e719b01d76f841eda6f2e6d3d41983d204b4,3e0e30bd646112d34198ad9c16b121bbb4981769..eaf45898f8b74a5c1d393ea632e6192602c49495
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -65,9 -69,9 +69,10 @@@ LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) f
  
  SUBDIRS = $(INSTALLED_SUBDIRS) win32 xdoc
  INSTALLED_SUBDIRS = microcode runtime $(OPTION_SUBDIRS) $(LIARC_BUNDLES)
+ BASICS_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
  OPTION_SUBDIRS = @OPTION_SUBDIRS@
  
 +PROJECT = @PROJECT@
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
  AUXDIR_NAME = @AUXDIR_NAME@
  AUXDIR = @AUXDIR@

diff --cc src/Setup.sh
Simple merge

diff --cc src/blowfish/Makefile.am
Simple merge

diff --cc src/blowfish/NEWS
index d810b177c16649f17cffc548bfae03b24fcc5057,dacbfcf50512ed9d76ce7756532943c1334ca93f..86d353f189057a2c566e79c1a0b99688c98d4acd
--- 1/src/blowfish/NEWS
--- 2/src/blowfish/NEWS
+++ b/src/blowfish/NEWS
@@@ -9,8 -3,10 +9,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the

diff --cc src/blowfish/blowfish-test.scm
Simple merge

diff --cc src/blowfish/blowfish.pkg
Simple merge

diff --cc src/blowfish/blowfish.texi
Simple merge

diff --cc src/blowfish/configure.ac
index 0b541af43bbfaf2eca784baff96774cf89092181,fdb7974ddc23c3ec695d90658fa01727f54eddc3..4cc078bcfaaba86e7f593b6a567988ebfba81c3a
--- 1/src/blowfish/configure.ac
--- 2/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@@ -10,17 -10,13 +10,17 @@@ AC_CONFIG_HEADERS([config.h]
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of a blowfish plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at
@@@ -48,8 -38,10 +48,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/configure.ac
index b469ea447b27c87f765de3ce9b276679dd828abd,274a57d8ad6b70c0f4a4528148c2fa4bf7fa76cc..1e539603fa101e6a208c2c3f72e11440a7bde4e5
--- 1/src/configure.ac
--- 2/src/configure.ac
+++ b/src/configure.ac
@@@ -163,14 -160,16 +167,17 @@@ svm1-32be|svm1-32le|svm1-64be|svm1-64le
  esac
  
  MIT_SCHEME_COMPILER_TARGET([${with_compiler_target}])
- if test x"${mit_scheme_compiler_target}" = xsvm1; then
+ case ${mit_scheme_compiler_target} in
+ svm1-32be|svm1-32le|svm1-64be|svm1-64le)
      IF_SVM_COMPILER=
- else
+     ;;
+ *)
      IF_SVM_COMPILER='#!svm compiler: '
- fi
+     ;;
+ esac
  
 -AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
 +PROJECT=${PACKAGE_TARNAME}
 +AUXDIR_NAME=${PACKAGE_TARNAME}
  AUXDIR='$(libdir)'/${AUXDIR_NAME}
  MIT_SCHEME_LIBDIR=${AUXDIR}/
  MIT_SCHEME_INCLUDEDIR=`pwd`/lib/
@@@ -388,8 -386,9 +394,10 @@@ AC_SUBST([IF_X11_SCREEN]
  AC_SUBST([INSTALL_COM])
  AC_SUBST([INSTALL_LIARC_BUNDLES])
  AC_SUBST([MIT_SCHEME_EXE])
+ AC_SUBST([mit_scheme_native_code])
+ AC_SUBST([mit_scheme_target_bytes_per_object])
  AC_SUBST([OPTION_SUBDIRS])
 +AC_SUBST([PROJECT])
  
  AC_PROG_INSTALL
  AC_PROG_LN_S

diff --cc src/edwin/Makefile.am
index 46d755621224b9131e19ab0a4900ce1c172bbf56,bdca6c4a34d92b4da86c1ea370c6ff9219e006b3..21f8781eb6a29a6e96e3318602e66be44a7c3d09
--- 1/src/edwin/Makefile.am
--- 2/src/edwin/Makefile.am
+++ b/src/edwin/Makefile.am
@@@ -1,12 -1,13 +1,13 @@@
  ## Process this file with automake to produce Makefile.in
  ##
  ## Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
- ##     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- ##     2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
- ##     Massachusetts Institute of Technology
- ## 
+ ##     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ ##     2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+ ##     2015, 2016, 2017, 2018, 2019 Massachusetts Institute of
+ ##     Technology
+ ##
  ## This file is part of MIT/GNU Scheme.
 -##
 +## 
  ## MIT/GNU Scheme is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
  ## the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/edwin/NEWS
index f3955bb4f5de5ecf27a5fe4a4b1e9c5eea3134b3,bd1d1254a28ed7f0744d6b74efe596ee674046a8..a083641fefbf7a1469f2bdd09fa89d10c2605b6b
--- 1/src/edwin/NEWS
--- 2/src/edwin/NEWS
+++ b/src/edwin/NEWS
@@@ -9,8 -3,10 +9,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the

diff --cc src/edwin/buffrm.scm
Simple merge

diff --cc src/edwin/bufwfs.scm
Simple merge

diff --cc src/edwin/bufwin.scm
Simple merge

diff --cc src/edwin/bufwiu.scm
Simple merge

diff --cc src/edwin/configure.ac
index f9923b376fccaba7d91945aa6c3b086333e839de,4fbc5fc162ac01cf9abaac2e5be5c19467e50d89..02340b351eb21f0a577ebb8bbdfceb735b5d7bc3
--- 1/src/edwin/configure.ac
--- 2/src/edwin/configure.ac
+++ b/src/edwin/configure.ac
@@@ -7,17 -7,13 +7,17 @@@ AC_INIT([MIT/GNU Scheme Pucked edwin pl
  AC_CONFIG_SRCDIR([edwin.pkg])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of an Edwin plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/edwin/edtfrm.scm
Simple merge

diff --cc src/edwin/edwin.pkg
Simple merge

diff --cc src/edwin/edwin.sf
Simple merge

diff --cc src/edwin/image.scm
Simple merge

diff --cc src/edwin/intmod.scm
Simple merge

diff --cc src/edwin/make.scm
Simple merge

diff --cc src/edwin/modwin.scm
Simple merge

diff --cc src/edwin/screen.scm
Simple merge

diff --cc src/edwin/tterm.scm
Simple merge

diff --cc src/edwin/utlwin.scm
Simple merge

diff --cc src/ffi/build.scm
Simple merge

diff --cc src/gdbm/Makefile.am
Simple merge

diff --cc src/gdbm/NEWS
index e1540daf6ca65a58ab0b834b6ca3f07081741b07,44d8c202ed592283a358606b4355837e498d8b12..e50f7476bd0250c6a7ad687b9eb9d1e172df580c
--- 1/src/gdbm/NEWS
--- 2/src/gdbm/NEWS
+++ b/src/gdbm/NEWS
@@@ -9,8 -3,10 +9,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the

diff --cc src/gdbm/configure.ac
index 707f44a8a8af853e88405152c9f0e3be9501720b,78e8cc89092d0a0d1b4af1670eb16de22e736653..90b918c8bd7ec8817478b5154d8edab2efac9b13
--- 1/src/gdbm/configure.ac
--- 2/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@@ -9,17 -9,13 +9,17 @@@ AC_CONFIG_SRCDIR([gdbm.pkg]
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of a gdbm plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/gdbm/gdbm.pkg
Simple merge

diff --cc src/gdbm/gdbm.texi
Simple merge

diff --cc src/imail/Makefile.am
index 1197310827fc0b38108442b3a9c5bfd3158d533a,edab7093956e33c28605ef940adbc708fdffb257..f2eb3570c4eb2fcf40841731eac583989f46aec8
--- 1/src/imail/Makefile.am
--- 2/src/imail/Makefile.am
+++ b/src/imail/Makefile.am
@@@ -1,18 -1,19 +1,19 @@@
  ## Process this file with automake to produce Makefile.in
  ##
  ## Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
- ##     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- ##     2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
- ##     Massachusetts Institute of Technology
+ ##     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ ##     2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+ ##     2015, 2016, 2017, 2018, 2019 Massachusetts Institute of
+ ##     Technology
  ##
 -## This file is part of MIT/GNU Scheme.
 +## This file is part of the IMail option for MIT/GNU Scheme.
  ##
 -## MIT/GNU Scheme is free software; you can redistribute it and/or modify
 -## it under the terms of the GNU General Public License as published by
 -## the Free Software Foundation; either version 2 of the License, or (at
 -## your option) any later version.
 +## IMail is free software; you can redistribute it and/or modify it
 +## under the terms of the GNU General Public License as published by
 +## the Free Software Foundation; either version 2 of the License, or
 +## (at your option) any later version.
  ##
 -## MIT/GNU Scheme is distributed in the hope that it will be useful, but
 +## IMail is distributed in the hope that it will be useful, but
  ## WITHOUT ANY WARRANTY; without even the implied warranty of
  ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  ## General Public License for more details.

diff --cc src/imail/NEWS
index 14c15ce25bec8162ade0f01a197e4afbb118fae7,63db3b323e6620c0859137f329e66c97c4f8769f..566ac67dd03969f3bc61c4d34e01afa5de126807
--- 1/src/imail/NEWS
--- 2/src/imail/NEWS
+++ b/src/imail/NEWS
@@@ -9,8 -3,10 +9,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the

diff --cc src/imail/compile.scm
Simple merge

diff --cc src/imail/configure.ac
index 63313b93712d81c8f5ccaffa2aea93f1bd9841c9,c61e49bb6fcf5513fc92e5788be6163ac6221d58..a5914949529d211cf4439f5bfd7d6bc404bb5cf3
--- 1/src/imail/configure.ac
--- 2/src/imail/configure.ac
+++ b/src/imail/configure.ac
@@@ -7,17 -7,13 +7,17 @@@ AC_INIT([MIT/GNU Scheme Pucked imail pl
  AC_CONFIG_SRCDIR([imail.pkg])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of an Imail plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/imail/imail.pkg
Simple merge

diff --cc src/imail/imail.texi
Simple merge

diff --cc src/imail/make.scm
Simple merge

diff --cc src/mcrypt/Makefile.am
Simple merge

diff --cc src/mcrypt/NEWS
index f22461572b631686f4dc9a9f25fdae63aa968e8c,26f7d454970e44f8764e631d82b849a2cffd5312..68bf955c42cff6a707049105b8be368472e79b20
--- 1/src/mcrypt/NEWS
--- 2/src/mcrypt/NEWS
+++ b/src/mcrypt/NEWS
@@@ -9,8 -3,10 +9,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the

diff --cc src/mcrypt/configure.ac
index b3221dd68a0d6377a64e83d840fe44c2dea8d3df,3a271d7ee9033b0c0927beedd973248a864ffd6b..8a9692b25c885e9cc65a57ba0a590294ffb91e12
--- 1/src/mcrypt/configure.ac
--- 2/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@@ -10,17 -10,13 +10,17 @@@ AC_CONFIG_HEADERS([config.h]
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of an mcrypt plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at
@@@ -48,8 -38,10 +48,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/mcrypt/mcrypt.pkg
Simple merge

diff --cc src/microcode/boot.c
Simple merge

diff --cc src/microcode/configure.ac
Simple merge

diff --cc src/microcode/debug.c
Simple merge

diff --cc src/microcode/makegen/Makefile.in.in
Simple merge

diff --cc src/microcode/mit_scheme_native_code.m4
Simple merge

diff --cc src/pgsql/Makefile.am
Simple merge

diff --cc src/pgsql/NEWS
Simple merge

diff --cc src/pgsql/configure.ac
index 013cacf877bac3875edaa1f25dd6ef1083f74feb,fa6b1129b2f1d8f5b1464ba17a0b5d6e996b6223..60371c97d9d0b8b727cf134605f62b36b28789ec
--- 1/src/pgsql/configure.ac
--- 2/src/pgsql/configure.ac
+++ b/src/pgsql/configure.ac
@@@ -10,17 -10,13 +10,17 @@@ AC_CONFIG_HEADERS([config.h]
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of a pgsql plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at
@@@ -48,8 -38,10 +48,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/pgsql/pgsql.pkg
Simple merge

diff --cc src/runtime/mit-macros.scm
Simple merge

diff --cc src/runtime/runtime.pkg
Simple merge

diff --cc src/runtime/version.scm
index f970e9c70be39bfd96eeeb76447ad4762ee0fd59,0ccddc26e63da23202761687e9aff1e52b78f9e0..f34a544de0b434b8c9c842be85146b8329016c87
--- 1/src/runtime/version.scm
--- 2/src/runtime/version.scm
+++ b/src/runtime/version.scm
@@@ -39,10 -39,10 +39,10 @@@ USA
         (let ((now last-copyright-year)
               (then 1986))
           (iota (+ (- now then) 1) then)))
-    (add-subsystem-identification! "Release" '(10 1 7))
 -   (add-subsystem-identification! "Release" '(10 90))
++   (add-subsystem-identification! "Release" '(10 1 9))
     (snarf-microcode-version!)
     (add-event-receiver! event:after-restore snarf-microcode-version!)
 -   (add-subsystem-identification! "Runtime" '(15 7))))
 +   (add-subsystem-identification! "Runtime" '(15 8))))
  
  (define (snarf-microcode-version!)
    (add-subsystem-identification! "Microcode"

diff --cc src/x11-screen/Makefile.am
Simple merge

diff --cc src/x11-screen/NEWS
Simple merge

diff --cc src/x11-screen/compile.scm
Simple merge

diff --cc src/x11-screen/configure.ac
index 4dcdd57d06fd8179847f7928ccb36decd5bc671f,49550bfcc412086d752a38eca6ae1327e7775aec..cb963be488146af1c5ae5a87bce97fff63df87c5
--- 1/src/x11-screen/configure.ac
--- 2/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@@ -7,17 -7,13 +7,17 @@@ AC_INIT([MIT/GNU Scheme Pucked Edwin X1
  AC_CONFIG_SRCDIR([x11-screen.pkg])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of an X11 screen plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of an X11-screen plugin for MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/x11-screen/ed-ffi.scm
Simple merge

diff --cc src/x11-screen/x11-screen.pkg
Simple merge

diff --cc src/x11-screen/x11-screen.scm
Simple merge

diff --cc src/x11/Makefile.am
Simple merge

diff --cc src/x11/NEWS
index 7d574d4828e6c1ec5ac1809b9e95d9079b539dfa,0ab5a0aff63f48d1af417ce32bc838315d17c91c..62952210a7082f745399b9b5c4ff2c416b4f5a82
--- 1/src/x11/NEWS
--- 2/src/x11/NEWS
+++ b/src/x11/NEWS
@@@ -9,8 -3,10 +9,8 @@@ an experimental version of MIT/GNU Sche
  Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the

diff --cc src/x11/compile.scm
Simple merge

diff --cc src/x11/configure.ac
index d66ad1308d764c4ca1ad0aab453f620cb6481d7c,e8c4d41a58dbeff07154a84957414de778a6dd19..26f5ca12b3998540006f526a14ca4294d41d42db
--- 1/src/x11/configure.ac
--- 2/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@@ -9,17 -9,13 +9,17 @@@ AC_CONFIG_SRCDIR([x11.pkg]
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_COPYRIGHT(
 -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +    2016, 2017, 2018 Matthew Birkholz
 +
 +This file is part of an X11 plugin for MIT/GNU Scheme Pucked,
 +an experimental version of MIT/GNU Scheme.
 +
 +Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
      1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
      2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018 Massachusetts Institute of Technology
+     2017, 2018, 2019 Massachusetts Institute of Technology
  
 -This file is part of an x11 plugin for MIT/GNU Scheme.
 -
  MIT/GNU Scheme is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or (at

diff --cc src/x11/x11.pkg
Simple merge