Merge branch 'master' into pucked.

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
index 648a7b32d3ec5f379d5afbbd3059aa65583974eb,d7b46a944b1a69945ced9fe97ec7efc46aad050e..4e6f32d9afadd771bb79263a463158c363824fbb
--- 1/doc/configure.ac
--- 2/doc/configure.ac
+++ b/doc/configure.ac
@@@ -43,15 -44,20 +44,27 @@@ PROJECT=mit-scheme-pucke
  TARGETS=
  INST_TARGETS=
  
 +# Install docs in subdirectories by medium, in anticipation of dozens
 +# of little plugin manuals.
 +docdir='$(datarootdir)/doc/$(PROJECT)'
 +htmldir='$(docdir)/html'
 +pdfdir='$(docdir)/pdf'
 +psdir='$(docdir)/ps'
 +
+ AC_ARG_ENABLE([html],
+     [AS_HELP_STRING([--enable-html],
+         [generate HTML documentation [[yes]]])])
+ : ${enable_html=yes}
+ if test x"${enable_html}" = xno; then
+     htmldir=
+ elif test x"${enable_html}" != xyes; then
+     htmldir=${enable_html}
+ fi
+ test x"${htmldir}" = x || TARGETS="${TARGETS} \$(TARGET_ROOT)/index.html"
+ test x"${htmldir}" = x || INST_TARGETS="${INST_TARGETS} install-html"
+ 
  AC_ARG_ENABLE([pdf],
-     [AC_HELP_STRING([--enable-pdf],
+     [AS_HELP_STRING([--enable-pdf],
        [generate PDF documentation [[yes]]])])
  : ${enable_pdf=yes}
  if test x"${enable_pdf}" = xno; then

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
index fa4e8cd55a4a46eda1764437ad55086c61042fc7,1ad46c614fa2f1fc66e2504bd846e2f56f279f49..92cc6c4f627402abdf6cdca2e14ffb8c5fdb1e62
--- 1/doc/ref-manual/scheme.texinfo
--- 2/doc/ref-manual/scheme.texinfo
+++ b/doc/ref-manual/scheme.texinfo
@@@ -1,9 -1,9 +1,9 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-ref
 +@setfilename reference
- @set VERSION 12.0.20
- @set UPDATED 19 May 2020
+ @set VERSION 12.0.50
 -@set UPDATED 2022-00-10
 -@settitle MIT/GNU Scheme @value{VERSION}
++@set UPDATED 25 Oct 2020
 +@settitle MIT/GNU Scheme Pucked @value{VERSION} Reference Manual
  @comment %**end of header
  @setchapternewpage odd
  @finalout
@@@ -567,9 -544,9 +545,10 @@@ Standards Suppor
  * SRFI 140::
  * SRFI 143::
  * SRFI 158::
+ * SRFI 219::
  
  @end detailmenu
 +@end ifnothtml
  @end menu
  
  @include acknowledgements.texi

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
Simple merge

diff --cc src/Setup.sh
Simple merge

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

diff --cc src/blowfish/NEWS
index c262fb5020c4ef7f2879cd57912efe3ba93e3d65,3bfd7cb77fce9db65894184749818aa5ef72fa52..bd17dd82e09b2b9a7827a4819c22bee0466e684c
--- 1/src/blowfish/NEWS
--- 2/src/blowfish/NEWS
+++ b/src/blowfish/NEWS
@@@ -8,8 -3,11 +8,9 @@@ This file is part of a blowfish plugin 
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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.pkg
Simple merge

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

diff --cc src/blowfish/configure.ac
index 4f8b83aa5b94d30681ed900751b45fe07100ac91,84ee5fa8e9b36907d8030c2876af7abb358e3ecb..66bbe9e08ba442e921da79dfad5ab7e50203de46
--- 1/src/blowfish/configure.ac
--- 2/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@@ -10,16 -10,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of a blowfish plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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
@@@ -46,8 -39,11 +47,9 @@@ This file is part of a blowfish plugin 
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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 6a9281bed9359533c2e588dc61a8598adcda3591,810ebf729007db8514495b0d137587e266fa7ae2..666a3fa9a9533d22474d7882830a43df0ef79d3d
--- 1/src/configure.ac
--- 2/src/configure.ac
+++ b/src/configure.ac
@@@ -1,15 -1,9 +1,12 @@@
  dnl Process this file with autoconf to produce a configure script.
  
 -AC_INIT([MIT/GNU Scheme], [12.0.50], [bug-mit-scheme@gnu.org], [mit-scheme])
 +AC_INIT([MIT/GNU Scheme Pucked],
 +      [12.0.20],
 +      [matt@birchwood-abbey.net],
 +      [mit-scheme-pucked])
  AC_CONFIG_SRCDIR([microcode/boot.c])
  AC_CONFIG_AUX_DIR([microcode])
- # Would set m4 macro dir, but only works if automake or libtools in use.
- # Instead we include directly.
- # AC_CONFIG_MACRO_DIR([microcode])
- m4_include([microcode/mit_scheme_native_code.m4])
+ AC_CONFIG_HEADERS([dummy-config.h])
  AC_PROG_MAKE_SET
  
  AC_COPYRIGHT(

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

diff --cc src/edwin/NEWS
index 9dc45ebfeb212c646d41d045dfa55a04d705f03b,0ceda666d8c69c0ef1b63f374326e88be9194bd7..983a22ba93c072b8bdb627cc631b77a619238235
--- 1/src/edwin/NEWS
--- 2/src/edwin/NEWS
+++ b/src/edwin/NEWS
@@@ -8,8 -3,11 +8,9 @@@ This file is part of an Edwin plugin fo
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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 3181b9d04998ae7ae56ab6f331e5e927c769ffae,e7ef4e2bf86b0acdf4927c456261541e06da53fa..b9cff1f0e009d5250006610a80f9fe367af75112
--- 1/src/edwin/configure.ac
--- 2/src/edwin/configure.ac
+++ b/src/edwin/configure.ac
@@@ -7,16 -7,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of an Edwin plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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/etc/optiondb.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 ff141653b36792c07a5c4ceed316779fdb00aa8c,600d3db81cb5756f55550b3e8f25c2bb1addcea7..bec860b20aae691a93a3f9d9c787f0117b8eb939
--- 1/src/gdbm/NEWS
--- 2/src/gdbm/NEWS
+++ b/src/gdbm/NEWS
@@@ -8,8 -3,11 +8,9 @@@ This file is part of a gdbm plugin for 
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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 c8e8a0a382bf3fbb5d025b4a8bc56c1e8ca712b3,3250f45b307778fbbe6364c97948b69b38b3872d..6b304c0a184b2f9f359a2fd413edb40439544888
--- 1/src/gdbm/configure.ac
--- 2/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@@ -9,16 -9,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of a gdbm plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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
Simple merge

diff --cc src/imail/NEWS
index 09b4c4000090e565abed6aed19b1e255171e9498,309c6c03d246f8a2f30ad2c03eeaa53eaf113756..f2044ace4e52664099317a8e97f534df2bcf4265
--- 1/src/imail/NEWS
--- 2/src/imail/NEWS
+++ b/src/imail/NEWS
@@@ -8,8 -3,11 +8,9 @@@ This file is part of an Imail plugin fo
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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 c9bfa45e5ac1e757b61db45b384860be6716910d,2ec9c5613e168736a7eef0fbb755fb3448c2a352..2995a7d5527d1a84fcf5457d0d5b2e4fc6e6c2d1
--- 1/src/imail/configure.ac
--- 2/src/imail/configure.ac
+++ b/src/imail/configure.ac
@@@ -7,16 -7,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of an Imail plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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/microcode/boot.c
Simple merge

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

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

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

diff --cc src/pgsql/NEWS
Simple merge

diff --cc src/pgsql/configure.ac
index a78641344b31931dae87055da4b0f5ee9f194261,602d4d19bee239c866f6c0a82b6d2f2f6d5d41c1..61cac101192c2bec2fbdb0efa5910628e3d959bc
--- 1/src/pgsql/configure.ac
--- 2/src/pgsql/configure.ac
+++ b/src/pgsql/configure.ac
@@@ -10,16 -10,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of a pgsql plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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
@@@ -46,8 -39,11 +47,9 @@@ This file is part of a pgsql plugin fo
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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/feature.scm
Simple merge

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

diff --cc src/runtime/version.scm
Simple merge

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

diff --cc src/x11-screen/NEWS
index c4b350a7011af5bb08b688281a427f250bb4bd6b,124bf6b23a406602a2caf52fcd94172986d4c54e..b40a9787aa3756f1196f0e507c01b86218c35745
--- 1/src/x11-screen/NEWS
--- 2/src/x11-screen/NEWS
+++ b/src/x11-screen/NEWS
@@@ -8,8 -3,11 +8,9 @@@ This file is part of an X11 screen plug
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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/x11-screen/compile.scm
Simple merge

diff --cc src/x11-screen/configure.ac
index 2cd6d2dafec98acc41966f1a32a09628647bd0fd,a9a0ac52a94f2cfa0cb4cb304185e500bdb5ff37..485413db4a4b429a5fa884a58ad01451efed7122
--- 1/src/x11-screen/configure.ac
--- 2/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@@ -7,16 -7,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of an X11 screen plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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/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 100fcbb361a1f3035db30de781e95ed9ba2723e7,6f7b75d69196799e0a44e5d3099a3c8ee0a96078..df177ec0a8df1414e54583fff5a684d6da4f9d43
--- 1/src/x11/NEWS
--- 2/src/x11/NEWS
+++ b/src/x11/NEWS
@@@ -8,8 -3,11 +8,9 @@@ This file is part of an X11 plugin for 
  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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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 cce7a03a661b539302c68242a2d49cc6e0368ef2,d9ae865634af65c0eda3ace1e95290ebcfdc0819..a3d51841f5170e58f088936abc8f53a38ae8c258
--- 1/src/x11/configure.ac
--- 2/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@@ -9,16 -9,14 +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, 2019, 2020 Matthew Birkholz
 +
 +This file is part of an X11 plugin for MIT/GNU Scheme Pucked.
 +
 +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, 2019, 2020 Massachusetts Institute of Technology
+     2017, 2018, 2019, 2020, 2021, 2022 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/x11/x11.pkg
Simple merge