Merge branch 'master' into pucked.

diff --cc src/x11/NEWS
index 1bfb025dc4b5c4e6940777ad631c1092e7ad9d79,2c975f27c56cb0fd62c6d0c1ccd9a04a074e847b..9c57d330b5c86cc690386e8035e6d687b95ddaaf
--- 1/src/x11/NEWS
--- 2/src/x11/NEWS
+++ b/src/x11/NEWS
@@@ -26,39 -22,33 +26,44 @@@ along with MIT/GNU Scheme; if not, writ
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  02110-1301, USA.
  
 -mit-scheme-x11 1.1 - Matt Birkholz, 2018-07-12
 -==============================================
++mit-scheme-pucked-x11 1.1.0 - Matt Birkholz, 2018-07-19
++=======================================================
++
++Upstream incremented its version number.
++
 +mit-scheme-pucked-x11 1.0.1 - Matt Birkholz, 2018-06-22
 +=======================================================
 +
 +New upstream provides missing import-x11 procedure (but does not
 +increment its version!).
 +
 +mit-scheme-pucked-x11 1.0.0 - Matt Birkholz, 2018-06-22
 +=======================================================
  
 -Actually export the import-x11 procedure to the global environment.
 +New upstream has replaced the x11 µmodule, added an import-x11
 +procedure, and deprecated the (runtime x-graphics) package, which now
 +autoloads this plugin.
  
 -mit-scheme-x11 1.0 - Matt Birkholz, 2018-06-21
 -==============================================
 +mit-scheme-pucked-x11 0.3.1 - Matt Birkholz, 2018-06-04
 +=======================================================
  
 -Replace the prx11.so µcode module.  Add an import-x11 procedure.  The
 -deprecated (runtimem x-graphics) package now autoloads this plugin.
 +New upstream allows CurrentTime as a Time argument.
  
 -mit-scheme-x11 0.3 - Matt Birkholz, 2018-06-01
 -==============================================
 +mit-scheme-pucked-x11 0.2.2 - Matt Birkholz, 2018-03-16
 +=======================================================
  
 -Allow CurrentTime as a Time argument (to fix an intermittent error
 -when cutting/pasting).
 +Allow CurrentTime (0) as an argument to procedures expecting a Time.
 +This eliminates a spurious error when cutting/pasting in Edwin.
  
 -mit-scheme-x11 0.2 - Matt Birkholz, 2017-05-23
 -==============================================
 +mit-scheme-pucked-x11 0.2.1 - Matt Birkholz, 2017-05-23
 +=======================================================
  
 -Use new Unicode support.  Convert (restrict) strings (atom names and
 -xterm content) to iso8859-1.  This should be transparent if you were
 -using standard Latin1 property names and writing only Latin1 graphical
 +New upstream converts (restricts) strings (atom names and xterm
 +content) to iso8859-1.  This should be transparent if you were using
 +standard Latin1 property names and writing only Latin1 graphical
  characters to your xterms.
  
 -mit-scheme-x11 0.1 - Matt Birkholz, 2016-02-19
 -==============================================
 +mit-scheme-pucked-x11 0.1.1 - Matt Birkholz, 2017-03-01
 +=======================================================
  
 -Converted to a libtool plugin.  Moved X11 data parsing
 -(x_event_to_object) to Scheme/FFI code.
 +Stole v0.1 from MIT/GNU Scheme.

diff --cc src/x11/configure.ac
index 71229034124f7e9f3ed858293016def933a58765,1b2c4c459ef6e441b18f55f0e7d0c17f98bb3b00..0a13701669dcc6f7a40a763bf9623a96a1aa3bb8
--- 1/src/x11/configure.ac
--- 2/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@@ -1,10 -1,10 +1,10 @@@
  dnl Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.69])
 -AC_INIT([MIT/GNU Scheme x11 plugin],
 -        [1.1],
 -        [bug-mit-scheme@gnu.org],
 -        [mit-scheme-x11])
 +AC_INIT([MIT/GNU Scheme Pucked x11 plugin],
-         [1.0.1],
++        [1.1.0],
 +        [matt@birchwood-abbey.net],
 +        [mit-scheme-pucked-x11])
  AC_CONFIG_SRCDIR([x11.pkg])
  AC_CONFIG_MACRO_DIR([m4])
  

diff --cc src/x11/debian/changelog
index b7b463f5d0d4a1b8065cf23ff3e77b8dae2ca606,0000000000000000000000000000000000000000..99849a141b65f5da68c5e3f010ee3126114febdf
mode 100644,000000..100644
--- 1/src/x11/debian/changelog
--- /dev/null
+++ b/src/x11/debian/changelog
@@@ -1,40 -1,0 +1,48 @@@
++mit-scheme-pucked-x11 (1.1.0) birchwood; urgency=low
++
++  * Upstream incremented its version number.
++
++ -- Matt Birkholz <matt@birchwood-abbey.net>  Thu, 19 Jul 2018 00:00:01 -0000
++
 +mit-scheme-pucked-x11 (1.0.1) birchwood; urgency=low
 +
 +  * New upstream provides missing import-x11 procedure (but does not
 +    increment its version!).
 +
++ -- Matt Birkholz <matt@birchwood-abbey.net>  Fri, 22 Jun 2018 00:00:01 -0000
++
 +mit-scheme-pucked-x11 (1.0.0) birchwood; urgency=low
 +
 +  * New upstream has replaced the x11 µmodule, added an import-x11
 +    procedure, and deprecated the (runtime x-graphics) package, which
 +    now autoloads this plugin.
 +
 + -- Matt Birkholz <matt@birchwood-abbey.net>  Fri, 22 Jun 2018 00:00:00 -0000
 +
 +mit-scheme-pucked-x11 (0.3.1) birchwood; urgency=low
 +
 +  * New upstream allows CurrentTime as a Time argument.
 +
 + -- Matt Birkholz <matt@birchwood-abbey.net>  Tue, 5 Jun 2018 00:00:00 -0000
 +
 +mit-scheme-pucked-x11 (0.2.2) birchwood; urgency=low
 +
 +  * Allow CurrentTime (0) as an argument to procedures expecting a Time.
 +    This eliminates a spurious error when cutting/pasting in Edwin.
 +
 + -- Matt Birkholz <matt@birchwood-abbey.net>  Fri, 16 Mar 2018 00:00:00 -0000
 +
 +mit-scheme-pucked-x11 (0.2.1) birchwood; urgency=low
 +
 +  * New upstream converts (restricts) strings (atom names and xterm
 +    content) to iso8859-1.  This should be transparent if you were
 +    using standard Latin1 property names and writing only Latin1
 +    graphical characters to your xterms.
 +
 + -- Matt Birkholz <matt@birchwood-abbey.net>  Tue, 23 May 2017 00:00:00 -0700
 +
 +mit-scheme-pucked-x11 (0.1.1) birchwood; urgency=low
 +
 +  * Stole v0.1 from MIT/GNU Scheme.
 +
 + -- Matt Birkholz <matt@birchwood-abbey.net>  Wed,  1 Mar 2017 00:00:00 -0700

diff --cc src/x11/make.scm
index 77af0200a75e25b8babc2dac9ba8a763a18cf7ef,c71b2aa076b30f7d7a5dd90dacd229abe5bd603f..39bb9a3d326bf53365bc68ae0c45db3baa5e38ea
--- 1/src/x11/make.scm
--- 2/src/x11/make.scm
+++ b/src/x11/make.scm
@@@ -5,4 -5,4 +5,4 @@@ Load the X11 option. |
  (with-loader-base-uri (system-library-uri "x11/")
    (lambda ()
      (load-package-set "x11")))
- (add-subsystem-identification! "X11" '(1 0 1))
 -(add-subsystem-identification! "X11" '(1 1))
++(add-subsystem-identification! "X11" '(1 1 0))