From: Matt Birkholz Date: Tue, 5 Jun 2018 23:17:04 +0000 (-0700) Subject: Merge branch 'master' into pucked. X-Git-Tag: mit-scheme-pucked-x11-0.3.1~6 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=bef5be7435db07c8c6e3de43edea3646e171ed80;p=mit-scheme.git Merge branch 'master' into pucked. --- bef5be7435db07c8c6e3de43edea3646e171ed80 diff --cc src/README.txt index 9b3df9fe5,d41d3f22f..2e14918a6 --- a/src/README.txt +++ b/src/README.txt @@@ -62,6 -62,12 +62,13 @@@ The compiler subsystem consists of thes * "cref" is a cross-reference program that also implements a rudimentary module system. + The editor subsystem consists of two directories: + -* "edwin" contains our Emacs-like editor written in Scheme. ++* "edwin" contains our Emacs-like editor written in Scheme and using ++ several plugins, e.g. gdbm, blowfish and x11. + + * "imail" contains an email-reading program for Edwin. + There are a few C/Unix FFI plugins: * "gdbm" wraps libgdbm, the GNU dbm database routines, and provides a @@@ -73,14 -79,13 +80,13 @@@ package (runtime blowfish). * "mcrypt" wraps libmcrypt and provides replacements for the mcrypt-* - procedures implemented in (runtime crypto). + procedures in (runtime crypto). - The editor subsystem consists of two directories: - - * "edwin" contains our Emacs-like editor written in Scheme and using - several plugins, e.g. gdbm, blowfish and x11. + * "pgsql" wraps libpq and provides a drop-in replacement for the + microcode module based package (runtime postgresql). - * "imail" contains an email-reading program for Edwin. + * "x11" wraps libX11 and provides a drop-in replacement for the + microcode module based package (runtime x-graphics). These are miscellaneous extras: diff --cc src/Tags.sh index 2094c5a99,b8df303fc..44c5bdf2a --- a/src/Tags.sh +++ b/src/Tags.sh @@@ -29,9 -29,14 +29,12 @@@ set - DEFAULT_SUBDIRS=( \ 6001 \ - blowfish \ compiler \ cref \ - edwin \ ffi \ + gdbm \ + imail \ + mcrypt \ microcode \ pgsql \ runtime \ diff --cc src/blowfish/NEWS index c16fef344,345cc7c7a..894d5119c --- a/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 Massachusetts Institute of Technology + 2017, 2018 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/configure.ac index d464d67bf,d56a9eded..a8d692213 --- a/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 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 Massachusetts Institute of Technology + 2017, 2018 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 Massachusetts Institute of Technology + 2017, 2018 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/NEWS index 0fdf5a717,85510ffa4..a02c2a6dc --- a/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 Massachusetts Institute of Technology + 2017, 2018 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 @@@ -26,8 -22,8 +26,13 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-gdbm 0.4 - Matt Birkholz, 2018-06-01 -=============================================== ++mit-scheme-pucked-gdbm 0.4.1 - Matt Birkholz, 2018-06-05 ++======================================================== ++ ++New upstream that accommodates gdbm 1.14. ++ +mit-scheme-pucked-gdbm 0.3.4 - Matt Birkholz, 2018-05-30 +======================================================== Accommodate gdbm 1.14 (in Ubuntu 18.04) but disable its file locking. diff --cc src/gdbm/configure.ac index 7875dcfef,9edc1b030..ce07afa15 --- a/src/gdbm/configure.ac +++ b/src/gdbm/configure.ac @@@ -1,25 -1,21 +1,25 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme gdbm plugin], - [0.4], - [bug-mit-scheme@gnu.org], - [mit-scheme-gdbm]) +AC_INIT([MIT/GNU Scheme Pucked gdbm plugin], - [0.3.4], - [matt@birchwood-abbey.net], ++ [0.4.1], ++ [puck@birchwood-abbey.net], + [mit-scheme-pucked-gdbm]) 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 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 Massachusetts Institute of Technology + 2017, 2018 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.texi index 4a5a476d2,0d5bafb81..bf15cbfb2 --- a/src/gdbm/gdbm.texi +++ b/src/gdbm/gdbm.texi @@@ -7,9 -7,12 +7,12 @@@ @comment %**end of header @copying -This manual documents MIT/GNU Scheme GDBM @value{VERSION}. +This manual documents MIT/GNU Scheme Pucked GDBM @value{VERSION}. - Copyright @copyright{} 2017 Massachusetts Institute of Technology + Copyright @copyright{} 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 Copyright @copyright{} 1993-99 Free Software Foundation, Inc. @quotation diff --cc src/gdbm/make.scm index c6442167d,3d16afed1..7404a148c --- a/src/gdbm/make.scm +++ b/src/gdbm/make.scm @@@ -6,4 -6,4 +6,4 @@@ (lambda () (load-package-set "gdbm"))) - (add-subsystem-identification! "GDBM" '(0 3 4)) -(add-subsystem-identification! "GDBM2" '(0 4)) ++(add-subsystem-identification! "GDBM" '(0 4 1)) diff --cc src/mcrypt/NEWS index 34d53aa6f,8168798a5..90ba8ce8a --- a/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 Massachusetts Institute of Technology + 2017, 2018 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 40983af8e,1b29a043c..d76b40c2d --- a/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 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 Massachusetts Institute of Technology + 2017, 2018 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 Massachusetts Institute of Technology + 2017, 2018 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/configure.ac index cbab2e91e,048e01fe6..0cf279c2e --- a/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 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 Massachusetts Institute of Technology + 2017, 2018 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 Massachusetts Institute of Technology + 2017, 2018 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/configure.ac index 18ad97583,61c835b84..467a59a3c --- a/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 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 Massachusetts Institute of Technology + 2017, 2018 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/NEWS index ebbf37263,32310520b..ce5cb660d --- a/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 Massachusetts Institute of Technology + 2017, 2018 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 @@@ -26,21 -22,22 +26,26 @@@ along with MIT/GNU Scheme; if not, writ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-x11 0.3 - Matt Birkholz, 2018-06-01 -============================================== ++mit-scheme-x11 0.3.1 - Matt Birkholz, 2018-06-04 ++================================================ ++ ++New upstream allows CurrentTime as a Time argument. ++ +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 a363ed785,f97b3aba5..b54b387f0 --- a/src/x11/configure.ac +++ b/src/x11/configure.ac @@@ -1,25 -1,21 +1,25 @@@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme x11 plugin], - [0.3], - [bug-mit-scheme@gnu.org], - [mit-scheme-x11]) +AC_INIT([MIT/GNU Scheme Pucked x11 plugin], - [0.2.2], - [matt@birchwood-abbey.net], ++ [0.3.1], ++ [puck@birchwood-abbey.net], + [mit-scheme-pucked-x11]) 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 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 Massachusetts Institute of Technology + 2017, 2018 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/make.scm index f4142b588,43f82e59a..61f4f8fea --- a/src/x11/make.scm +++ b/src/x11/make.scm @@@ -5,4 -5,112 +5,4 @@@ Load the X11 option. | (with-loader-base-uri (system-library-uri "x11/") (lambda () (load-package-set "x11"))) - (add-subsystem-identification! "X11" '(0 2 2)) -(add-subsystem-identification! "X11" '(0 3)) - -;; Until the microcode module based X Graphics system is removed, -;; reassign the define-primitives bindings in (runtime x-graphics) to -;; their replacements in (x11). -(let ((x-graphics (->environment '(runtime x-graphics))) - (x11 (->environment '(x11)))) - (for-each (lambda (name) - (environment-assign! x-graphics name - (environment-lookup x11 name))) - '( - x-close-all-displays - x-display-descriptor - x-display-get-default - x-display-process-events - x-font-structure - x-window-beep - x-window-clear - x-window-colormap - x-window-depth - x-window-event-mask - x-window-flush - x-window-iconify - x-window-id - x-window-lower - x-window-map - x-window-query-pointer - x-window-raise - x-window-set-background-color - x-window-set-border-color - x-window-set-border-width - x-window-set-cursor-color - x-window-set-event-mask - x-window-set-font - x-window-set-foreground-color - x-window-set-icon-name - x-window-set-input-hint - x-window-set-internal-border-width - x-window-set-mouse-color - x-window-set-mouse-shape - x-window-set-name - x-window-set-position - x-window-set-size - x-window-visual - x-window-withdraw - x-window-x-size - x-window-y-size - x-graphics-copy-area - x-graphics-drag-cursor - x-graphics-draw-arc - x-graphics-draw-line - x-graphics-draw-lines - x-graphics-draw-point - x-graphics-draw-points - x-graphics-draw-string - x-graphics-draw-image-string - x-graphics-fill-polygon - x-graphics-map-x-coordinate - x-graphics-map-y-coordinate - x-graphics-move-cursor - x-graphics-open-window - x-graphics-reconfigure - x-graphics-reset-clip-rectangle - x-graphics-set-clip-rectangle - x-graphics-set-dashes - x-graphics-set-fill-style - x-graphics-set-function - x-graphics-set-line-style - x-graphics-set-vdc-extent - x-graphics-vdc-extent - x-bytes-into-image - x-create-image - x-destroy-image - x-display-image - x-get-pixel-from-image - x-set-pixel-in-image - x-allocate-color - x-create-colormap - x-free-colormap - x-query-color - x-set-window-colormap - x-store-color - x-store-colors - x-visual-deallocate))) - -;; Check that these (integrated!) constants DO "match" the C -;; constants, just because we can (with the FFI's help). -(let ((x-graphics (->environment '(runtime x-graphics))) - (x11 (->environment '(x11)))) - (for-each (lambda (name) - (if (not (equal? (environment-lookup x-graphics name) - (environment-lookup x11 name))) - (warn "Incorrect C constant in (runtime x-graphics):" name))) - '(event-type:button-down - event-type:button-up - event-type:configure - event-type:enter - event-type:focus-in - event-type:focus-out - event-type:key-press - event-type:leave - event-type:motion - event-type:expose - event-type:delete-window - event-type:map - event-type:unmap - event-type:take-focus - event-type:visibility - number-of-event-types))) ++(add-subsystem-identification! "X11" '(0 3 1))