From 63e6cf400bf6ddeb46927d4bf06472bae9ac08b0 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 9 Oct 2018 23:56:34 -0700 Subject: [PATCH] Make Edwin and Imail separately installable projects. Do not build them with the core. Build them after certain plugins are installed. --- dist/shared.sh | 2 +- doc/Makefile.in | 2 +- doc/configure.ac | 1 - doc/ffi/ffi.texinfo | 14 +- doc/imail/Makefile.in | 33 - doc/index.html | 1 - doc/info-dir | 2 - doc/mit-scheme.1 | 4 +- doc/user-manual/user.texinfo | 18 +- src/Makefile.in | 136 +-- src/Setup.sh | 4 +- src/berkeley-db/configure.ac | 2 +- src/configure.ac | 4 +- src/edwin/AUTHORS | 7 + src/edwin/COPYING | 482 +++++++++++ src/edwin/ChangeLog | 7 + src/edwin/Makefile-fragment | 13 - src/edwin/Makefile.am | 88 ++ src/edwin/NEWS | 28 + src/edwin/README | 33 +- src/edwin/TUTORIAL | 786 ++++++++++++++++++ src/edwin/autogen.sh | 5 + src/edwin/compile.sh | 41 + src/edwin/configure.ac | 58 ++ src/edwin/editor.scm | 9 - src/edwin/edwin.pkg | 29 +- src/edwin/edwin.sf | 7 +- src/edwin/filcom.scm | 3 +- src/edwin/fileio.scm | 4 +- src/edwin/make.scm | 5 +- src/edwin/nntp.scm | 5 +- src/edwin/sources.sh | 89 ++ src/etc/build-bands.sh | 1 - src/etc/compile.scm | 5 +- src/etc/create-makefiles.sh | 2 +- src/etc/optiondb.scm | 6 - src/etc/utilities.scm | 5 - src/imail/AUTHORS | 6 + src/imail/COPYING | 482 +++++++++++ src/imail/ChangeLog | 7 + src/imail/Makefile-fragment | 7 - src/imail/Makefile.am | 120 +++ src/imail/NEWS | 28 + src/imail/README | 30 + src/imail/autogen.sh | 4 + src/imail/compile.scm | 2 +- src/imail/compile.sh | 44 + src/imail/configure.ac | 54 ++ src/imail/imail.pkg | 8 +- src/imail/install.sh | 2 - src/imail/load.scm | 36 - src/imail/make.scm | 36 + .../imail/mit-scheme-imail.texi | 2 +- src/runtime/command-line.scm | 3 + src/runtime/global.scm | 24 + src/runtime/runtime.pkg | 3 + tests/runtime/test-syncproc.scm | 2 + 57 files changed, 2535 insertions(+), 306 deletions(-) delete mode 100644 doc/imail/Makefile.in create mode 100644 src/edwin/AUTHORS create mode 100644 src/edwin/COPYING create mode 100644 src/edwin/ChangeLog delete mode 100644 src/edwin/Makefile-fragment create mode 100644 src/edwin/Makefile.am create mode 100644 src/edwin/NEWS create mode 100644 src/edwin/TUTORIAL create mode 100755 src/edwin/autogen.sh create mode 100755 src/edwin/compile.sh create mode 100644 src/edwin/configure.ac create mode 100755 src/edwin/sources.sh create mode 100644 src/imail/AUTHORS create mode 100644 src/imail/COPYING create mode 100644 src/imail/ChangeLog delete mode 100644 src/imail/Makefile-fragment create mode 100644 src/imail/Makefile.am create mode 100644 src/imail/NEWS create mode 100644 src/imail/README create mode 100755 src/imail/autogen.sh create mode 100755 src/imail/compile.sh create mode 100644 src/imail/configure.ac delete mode 100755 src/imail/install.sh delete mode 100644 src/imail/load.scm create mode 100644 src/imail/make.scm rename doc/imail/imail.texinfo => src/imail/mit-scheme-imail.texi (99%) diff --git a/dist/shared.sh b/dist/shared.sh index 7f1bd55b4..881edc04a 100644 --- a/dist/shared.sh +++ b/dist/shared.sh @@ -100,7 +100,7 @@ LIARC_OUT=${OUTPUT_DIR}/liarc NATIVE_OUT=${OUTPUT_DIR}/native MACOSX_OUT=${OUTPUT_DIR}/macosx -PLUGINS="blowfish gdbm mcrypt x11 x11-screen" +PLUGINS="blowfish gdbm mcrypt edwin imail x11 x11-screen" notify () { diff --git a/doc/Makefile.in b/doc/Makefile.in index 436b9c16e..7d774e54f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -69,7 +69,7 @@ pdfdir = @pdfdir@ psdir = @psdir@ INST_TARGETS = @INST_TARGETS@ -SUBDIRS = ffi imail ref-manual sos user-manual +SUBDIRS = ffi ref-manual sos user-manual DISTCLEAN_FILES = Makefile make-common config.log config.status all: diff --git a/doc/configure.ac b/doc/configure.ac index f29fab06c..64a0e290e 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -81,7 +81,6 @@ AC_CONFIG_FILES([ Makefile make-common ffi/Makefile - imail/Makefile ref-manual/Makefile sos/Makefile user-manual/Makefile]) diff --git a/doc/ffi/ffi.texinfo b/doc/ffi/ffi.texinfo index 717fd1058..dd28f0999 100644 --- a/doc/ffi/ffi.texinfo +++ b/doc/ffi/ffi.texinfo @@ -145,7 +145,6 @@ Examples of the new syntax: (C-callback (lambda (window event) @dots{})) @myresult{} 13 @r{; A fixnum registration ID.} @end group - @end example @comment The C-array-loc! example assumes 2 GdkColors are 6 words, #x18bytes. @comment 0x081afc78 - 0x081afc60 = 0x18 @@ -173,7 +172,7 @@ parsed declarations), @file{@i{library}-const.c} (a C program that prints C constants and struct offsets), and @file{@i{library}-shim.c} (trampoline functions adapting Scheme procedure application to C function call). The @file{-const.c} program generates a -@file{-const.scm} file, which can be syntaxed to produce a +@file{-const.scm} file, which can be expanded into a @file{-const.bin} file. @smallexample @@ -184,7 +183,7 @@ function call). The @file{-const.c} program generates a The @file{-types.bin} and @file{-const.bin} files together provide the information needed to expand @code{C-...} syntax, and are only needed at syntax time. The compiled @file{-shim.so} file is used at -run time, dynamically loaded into the Scheme machine. @ref{Compiling +run time, dynamically loaded into the Scheme machine. @xref{Compiling and Linking}, which describes these files in more detail, and shows how they might be built and installed. @@ -195,7 +194,7 @@ how they might be built and installed. The @strong{@code{C-include}} syntax loads the @file{-types.bin} and @file{-const.bin} files @emph{at syntax time}. It should appear at the top level of any file containing @code{C-...} syntax, or be -evaluated in the syntax environment of such code. +expanded in the syntax environment of such code. The @strong{@code{C-call}} syntax arranges to invoke a callout trampoline. Arguments to the trampoline can be integers, floats, @@ -242,6 +241,7 @@ accessed (if any). @expansion{} (#[primitive c-peek-int] alien 4) @end group +@c (param:pp-primitives-by-name? #f) to display primitives thuswise. @group (C->= alien "GdkRectangle width" 0) @@ -274,8 +274,8 @@ peeked pointer. This avoids consing a new alien. @end smallexample The above syntax is understood to say ``The data at this @code{alien} -address is a GtkWidget. Load its @code{style} member (an alien -address), into @code{alien} (clobbering @code{alien}'s old address).'' +address is a GtkWidget. Load its @code{style} member into +@code{alien} (clobbering @code{alien}'s old address).'' The @strong{@code{C-enum}}, @strong{@code{C-sizeof}} and @strong{@code{C-offset}} syntaxes all @@ -300,7 +300,6 @@ byte size and a byte offset respectively. @expansion{} 8 @end group - @end smallexample The two element form of the @code{C-enum} syntax can be used to find @@ -1150,5 +1149,4 @@ If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software. - @bye diff --git a/doc/imail/Makefile.in b/doc/imail/Makefile.in deleted file mode 100644 index 946b652d2..000000000 --- a/doc/imail/Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ - -# 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 -# -# 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 your option) any later version. -# -# MIT/GNU Scheme 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. -# -# You should have received a copy of the GNU General Public License -# along with MIT/GNU Scheme; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301, USA. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -TARGET_ROOT = mit-scheme-imail -TEXINFO_ROOT = imail -SOURCES = $(TEXINFO_ROOT).texinfo - -include $(top_srcdir)/make-common diff --git a/doc/index.html b/doc/index.html index ecc5a4943..0351ec5b5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -14,7 +14,6 @@ The following MIT/GNU Scheme manuals are available.
  • User's Manual
  • Reference Manual
  • Scheme Object System
    • -
  • IMAP/MIME email reader
  • Foreign Function Interface
    • diff --git a/doc/info-dir b/doc/info-dir index 0bac0e8f0..37f0bfa96 100644 --- a/doc/info-dir +++ b/doc/info-dir @@ -17,8 +17,6 @@ Programming Languages * MIT/GNU Scheme FFI: (mit-scheme-ffi). Foreign Function Interface -* MIT/GNU Scheme IMAIL: (mit-scheme-imail). - IMAP/MIME email reader * MIT/GNU Scheme Reference: (mit-scheme-ref). Reference Manual * MIT/GNU Scheme SOS: (mit-scheme-sos). diff --git a/doc/mit-scheme.1 b/doc/mit-scheme.1 index f013a408e..37009a72e 100644 --- a/doc/mit-scheme.1 +++ b/doc/mit-scheme.1 @@ -93,6 +93,4 @@ program is properly installed at your site, the command .PP should give you access to the complete user's manual. Programming information is located in the Info topics "MIT/GNU Scheme Ref" and -"SOS". Usage of the -.B IMAIL -mail reader is located in the "IMAIL" topic. +"SOS". diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo index cca9dd92c..3ca312e7e 100644 --- a/doc/user-manual/user.texinfo +++ b/doc/user-manual/user.texinfo @@ -249,9 +249,14 @@ installed separately. To get all of the functionality previously available in version 9.2 you will need to build and install all of the plugins included in the -@file{src} subdirectory: blowfish, gdbm, mcrypt, pgsql, x11 and -x11-screen. Without the x11-screen option installed Edwin will only -display on a terminal. +@file{src} subdirectory: blowfish, gdbm, mcrypt, pgsql, edwin, imail, +x11 and x11-screen. Edwin does not use the C/FFI directly, but it +does use the blowfish and gdbm plugins. It is now built separately, +like a plugin, after the blowfish and gdbm plugins are installed. +Similarly, Imail must be built after Edwin is installed, and the X11 +Screen option cannot be built until Edwin and the X11 plugin are +installed. And without X11 Screen, Edwin will only display on a +terminal. These plugins are all configured, built and installed in the GNU standard way. See the @file{README} file in each plugin's source @@ -382,7 +387,6 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Image saved on Wednesday November 25, 2015 at 3:49:35 PM Release 9.2.1 || Microcode 15.3 || Runtime 15.7 || SF 4.41 || LIAR/i386 4.118 - Edwin 3.116 @end example @noindent @@ -728,13 +732,11 @@ arguments (even those starting with a hyphen) to the list returned by the @code{command-line-arguments} procedure. @end table -@noindent -The following option is supported only when Edwin is loaded. - @table @option @item --edit @opindex --edit -This option causes Edwin to start immediately when Scheme is started. +This option causes Edwin to be loaded and started immediately when +Scheme is started. @end table @node Custom Command-line Options diff --git a/src/Makefile.in b/src/Makefile.in index 6b6de4a88..0a41b6720 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -61,7 +61,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/microcode/mkinstalldirs # **** END BOILERPLATE **** LIARC_BOOT_BUNDLES = compiler cref sf star-parser -LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml +LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) ffi sos ssp xml SUBDIRS = $(INSTALLED_SUBDIRS) 6001 win32 xdoc INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) @@ -69,7 +69,6 @@ INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ AUXDIR_NAME = @AUXDIR_NAME@ AUXDIR = @AUXDIR@ -EDDIR = $(AUXDIR)/edwin default-target: @DEFAULT_TARGET@ @@ -84,9 +83,7 @@ all-native: lib/runtime.com all-native: lib/all.com all-native: all-compiler all-native: all-cref -all-native: all-edwin all-native: all-ffi -all-native: all-imail all-native: all-runtime all-native: all-sf all-native: all-sos @@ -121,7 +118,7 @@ toolchain: $(TOOLCHAIN)/compiler.com $(MAKE) -f Makefile.tools clean && $(MAKE) -f Makefile.tools allclean # This target toolchain crud is a kludge until the whole system can be -# cross-compiled. Currently only IMAIL can't be. +# cross-compiled. TARGET_COMPILER_SETTINGS = \ $(COMPILER_SETTINGS_LIARC) @@ -187,7 +184,6 @@ lib/runtime.com: microcode/scheme --fasl "$${FASL}")) lib/compiler.com: all-compiler -lib/compiler.com: all-edwin lib/compiler.com: all-sf lib/compiler.com: lib/runtime.com lib/compiler.com: microcode/scheme @@ -198,14 +194,12 @@ lib/compiler.com: microcode/scheme | ./microcode/scheme --batch-mode --library lib --band runtime.com lib/all.com: all-compiler -lib/all.com: all-edwin lib/all.com: all-sf lib/all.com: lib/runtime.com lib/all.com: microcode/scheme (echo '(begin' && \ echo ' (load-option (quote COMPILER))' && \ echo ' (load-option (quote SF))' && \ - echo ' (load-option (quote EDWIN))' && \ echo ' (disk-save "$@"))') \ | ./microcode/scheme --batch-mode --library lib --band runtime.com @@ -460,52 +454,6 @@ sf/sf-w32.pkd: sf/sf-unx.pkd ### built compiler in the native case, but we want to avoid having to ### do that to encourage cross-compilation. -# Edwin - -.PHONY: all-edwin -all-edwin: compile-edwin -@IF_LIARC@all-edwin: bundle-edwin - -.PHONY: bundle-edwin -bundle-edwin: liarc-bundle-tools -bundle-edwin: compile-edwin -bundle-edwin: edwin/edwin.c -bundle-edwin: edwin/edwin-unx.c -bundle-edwin: edwin/edwin-w32.c - (cd edwin && $(MAKE) compile-liarc-bundle) - -edwin/edwin.bld: syntax-edwin - -.PHONY: compile-edwin -compile-edwin: toolchain -compile-edwin: syntax-edwin - (echo '(with-working-directory-pathname "edwin"' && \ - echo ' (lambda () (load "edwin.cbf")))') \ - | $(TOOL_TOOLCHAIN) - -.PHONY: syntax-edwin -syntax-edwin: toolchain -syntax-edwin: cref-edwin - (echo '(with-working-directory-pathname "edwin"' && \ - echo ' (lambda () (load "edwin.sf")))') \ - | $(TOOL_TOOLCHAIN) - -.PHONY: cref-edwin -cref-edwin: edwin/edwin-unx.pkd - -edwin/edwin-unx.pkd: toolchain -edwin/edwin-unx.pkd: cref-runtime -edwin/edwin-unx.pkd: cref-win32 -edwin/edwin-unx.pkd: cref-xml -edwin/edwin-unx.pkd: edwin/edwin.pkg - (echo '(with-working-directory-pathname "edwin"' && \ - echo ' (lambda ()' && \ - echo ' (cref/generate-trivial-constructor "edwin")))') \ - | $(TOOL_SYNTAXER) - -# XXX Kludgey bogus rules for liarc. -edwin/edwin-w32.pkd: edwin/edwin-unx.pkd - # FFI .PHONY: all-ffi @@ -723,14 +671,12 @@ xml/xml-w32.pkd: xml/xml-unx.pkd # # Anything that depends on running the target code should depend on # cross-target, and there should be a plan for obviating the need to -# run the target code. Currently this is only IMAIL. +# run the target code. .PHONY: cross-host cross-host: compile-compiler cross-host: compile-cref -cross-host: compile-edwin cross-host: compile-ffi -#cross-host: compile-imail cross-host: compile-runtime cross-host: compile-sf cross-host: compile-sos @@ -759,80 +705,6 @@ cross-end: cross-host | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \ --fasl make.com) -### Stuff that depends on running the code we just compiled, because it -### uses Edwin macros. This is a kludge until we can fix macro phasing -### and persuade the cross-compiler to load and run macros for the -### target. - -# IMAIL - -.PHONY: all-imail -all-imail: compile-imail -@IF_LIARC@all-imail: bundle-imail - -.PHONY: bundle-imail -bundle-imail: liarc-bundle-tools -bundle-imail: compile-imail -bundle-imail: imail/imail-unx.c -bundle-imail: imail/imail-w32.c - (cd imail && $(MAKE) compile-liarc-bundle) - -# Must write these rules explicitly because we use TARGET_COMPILER, not -# TOOL_COMPILER. -# -# XXX These depend on imail/imail-unx.pkd intentionally because make -# has no good way to express a rule that generates multiple files at -# once. -imail/imail-unx.c: imail/imail-unx.pkd - echo '(cbf "imail/imail-unx.pkd")' | $(TARGET_COMPILER) -imail/imail-w32.c: imail/imail-unx.pkd - echo '(cbf "imail/imail-w32.pkd")' | $(TARGET_COMPILER) - -# XXX We enter lib/imail/ rather than imail/ so that liarc library -# directory pathnames get resolved to builtin objects. This is a -# kludge. - -.PHONY: compile-imail -compile-imail: target-toolchain -compile-imail: compile-edwin -compile-imail: compile-runtime -compile-imail: compile-sos -compile-imail: compile-star-parser -compile-imail: cref-imail - (echo '(begin' && \ - echo ' (load-option (quote *PARSER))' && \ - echo ' (load-option (quote EDWIN))' && \ - echo ' (load-option (quote SOS))' && \ - echo ' (with-working-directory-pathname "lib/imail"' && \ - echo ' (lambda ()' && \ - echo ' (load "compile"))))') \ - | $(TARGET_TOOLCHAIN) - -.PHONY: cref-imail -cref-imail: imail/imail-unx.pkd - -@IF_LIARC@IMAIL_CREF_PRELOAD = \ -@IF_LIARC@ echo '(load-option (quote SOS))' && \ -@IF_LIARC@ echo '(load-option (quote EDWIN))' && \ -@IF_LIARC@ echo '(load-option (quote *PARSER))' && - -imail/imail-unx.pkd: target-toolchain -imail/imail-unx.pkd: cref-edwin -imail/imail-unx.pkd: cref-runtime -imail/imail-unx.pkd: cref-sos -imail/imail-unx.pkd: cref-star-parser -@IF_LIARC@imail/imail-unx.pkd: all-edwin -@IF_LIARC@imail/imail-unx.pkd: all-runtime -@IF_LIARC@imail/imail-unx.pkd: all-sos -@IF_LIARC@imail/imail-unx.pkd: all-star-parser -imail/imail-unx.pkd: imail/imail.pkg - (echo '(begin' && \ - $(IMAIL_CREF_PRELOAD) \ - echo ' (with-working-directory-pathname "lib/imail"' && \ - echo ' (lambda ()' && \ - echo ' (cref/generate-trivial-constructor "imail"))))') \ - | $(TARGET_SYNTAXER) - # **** Legacy serialized targets **** all-liarc: @@ -928,8 +800,6 @@ install: install-standard @INSTALL_LIARC_BUNDLES@ install-standard: install-auxdir-top etc/make-in-subdirs.sh install $(INSTALLED_SUBDIRS) - $(mkinstalldirs) $(DESTDIR)$(EDDIR) - $(INSTALL_DATA) $(top_srcdir)/etc/TUTORIAL $(DESTDIR)$(EDDIR)/. install-auxdir-top: $(mkinstalldirs) $(DESTDIR)$(AUXDIR) diff --git a/src/Setup.sh b/src/Setup.sh index 2c0a707a8..67cb70d89 100755 --- a/src/Setup.sh +++ b/src/Setup.sh @@ -75,7 +75,7 @@ fi . etc/functions.sh -INSTALLED_SUBDIRS="cref edwin ffi imail sf sos ssp star-parser xml" +INSTALLED_SUBDIRS="cref ffi sf sos ssp star-parser xml" OTHER_SUBDIRS="6001 compiler runtime win32 xdoc microcode" # lib @@ -86,9 +86,7 @@ maybe_link lib/optiondb.scm ../etc/optiondb.scm maybe_link lib/compiler ../compiler maybe_link lib/cref ../cref -maybe_link lib/edwin ../edwin maybe_link lib/ffi ../ffi -maybe_link lib/imail ../imail maybe_link lib/runtime ../runtime maybe_link lib/sf ../sf maybe_link lib/sos ../sos diff --git a/src/berkeley-db/configure.ac b/src/berkeley-db/configure.ac index ced941a1a..69ab50a15 100644 --- a/src/berkeley-db/configure.ac +++ b/src/berkeley-db/configure.ac @@ -35,7 +35,7 @@ if test "${with_db_4}" != no; then ]) fi -MIT_SCHEME_PROJECT=mit-scheme-pucked +MIT_SCHEME_PROJECT=mit-scheme # Install plugin docs in Scheme's docdir subdirectories. htmldir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/html' diff --git a/src/configure.ac b/src/configure.ac index 6f6a397a2..f978f07d1 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -214,9 +214,7 @@ Makefile.tools 6001/Makefile compiler/Makefile cref/Makefile -edwin/Makefile ffi/Makefile -imail/Makefile runtime/Makefile sf/Makefile sos/Makefile @@ -236,7 +234,7 @@ if test x"${mit_scheme_native_code}" = xc; then for BN in star-parser; do (cd lib; rm -f ${BN}; ${LN_S} ../${BN} .) done - for BUNDLE in 6001 compiler cref edwin ffi imail sf sos ssp star-parser \ + for BUNDLE in 6001 compiler cref ffi sf sos ssp star-parser \ xdoc xml; do SO=${BUNDLE}.so (cd lib/lib; rm -f ${SO}; ${LN_S} ../../${BUNDLE}/${SO} .) diff --git a/src/edwin/AUTHORS b/src/edwin/AUTHORS new file mode 100644 index 000000000..e7f049cb3 --- /dev/null +++ b/src/edwin/AUTHORS @@ -0,0 +1,7 @@ +To find out what should go in this file, see "Information For +Maintainers of GNU Software" (maintain.texi), the section called +"Recording Changes". + +Matt Birkholz The conversion to a plugin, the monitor- + world command. +The MIT/GNU Scheme Team The original EDWIN option. diff --git a/src/edwin/COPYING b/src/edwin/COPYING new file mode 100644 index 000000000..bf50f20de --- /dev/null +++ b/src/edwin/COPYING @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307 USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/src/edwin/ChangeLog b/src/edwin/ChangeLog new file mode 100644 index 000000000..75658c2b8 --- /dev/null +++ b/src/edwin/ChangeLog @@ -0,0 +1,7 @@ +-*-Text-*- + +Please see the git commit log: + +$ git clone git://git.savannah.gnu.org/mit-scheme.git whatever +$ cd whatever/ +$ git log origin/master -- src/edwin/ | more diff --git a/src/edwin/Makefile-fragment b/src/edwin/Makefile-fragment deleted file mode 100644 index 56d56450c..000000000 --- a/src/edwin/Makefile-fragment +++ /dev/null @@ -1,13 +0,0 @@ -EDDIR = $(AUXDIR)/edwin -EDOPTS = debian-changelog eystep lisppaste manual midas nntp paredit pasmod \ - print pwedit pwparse snr sort techinfo telnet tximod verilog vhdl \ - webster - -install: - rm -rf $(DESTDIR)$(EDDIR) - $(mkinstalldirs) $(DESTDIR)$(EDDIR) - $(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(EDDIR)/. - @for F in $(EDOPTS); do \ - CMD="$(INSTALL_COM) $${F}.com $(DESTDIR)$(EDDIR)/.";\ - echo "$${CMD}"; eval "$${CMD}";\ - done diff --git a/src/edwin/Makefile.am b/src/edwin/Makefile.am new file mode 100644 index 000000000..b98989791 --- /dev/null +++ b/src/edwin/Makefile.am @@ -0,0 +1,88 @@ +## 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 +## +## 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 +## your option) any later version. +## +## MIT/GNU Scheme 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. +## +## You should have received a copy of the GNU General Public License +## along with MIT/GNU Scheme; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +## USA. + +EXTRA_DIST = autogen.sh + +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ +scmlibdir = @MIT_SCHEME_LIBDIR@ +scmlib_subdir = $(scmlibdir)edwin +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ + +sources =@MIT_SCHEME_SOURCES@ +binaries =@MIT_SCHEME_BINARIES@ + +scmlib_sub_DATA = $(sources) +scmlib_sub_DATA += $(binaries) +scmlib_sub_DATA += loadef.scm edwin.bld +scmlib_sub_DATA += make.scm edwin.pkg edwin-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += TUTORIAL + +#info_TEXINFOS = mit-scheme-edwin.texi +#AM_MAKEINFOHTMLFLAGS = --no-split + +include $(srcdir)/source-dependencies.am +edwin.bld: stamp-scheme +edwin-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +stamp-scheme: $(sources) edwin.ldr edwin.pkg + touch stamp-scheme + if ! ./compile.sh; then rm stamp-scheme; exit 1; fi + +CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd *.bld +CLEANFILES += stamp-scheme + +#TESTS = edwin-check.sh + +ETAGS_ARGS = $(sources) edwin.ldr +TAGS_DEPENDENCIES = $(sources) edwin.ldr + +EXTRA_DIST += $(sources) TUTORIAL +EXTRA_DIST += sources.sh compile.sh decls.scm edwin.ldr +EXTRA_DIST += edwin.sf edwin.cbf edwin.pkg + +install-data-hook: + ( echo '(add-plugin "edwin" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "edwin" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-info-am: + +uninstall-info-am: + +uninstall-hook: + ( echo '(remove-plugin "edwin" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ + && rmdir "$(DESTDIR)$(scmlib_subdir)" diff --git a/src/edwin/NEWS b/src/edwin/NEWS new file mode 100644 index 000000000..72a93db57 --- /dev/null +++ b/src/edwin/NEWS @@ -0,0 +1,28 @@ +mit-scheme-edwin NEWS -- history of user-visible changes. + +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 + +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 your option) any later version. + +MIT/GNU Scheme 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. + +You should have received a copy of the GNU General Public License +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301, USA. + +mit-scheme-edwin 3.117 - Matt Birkholz, 2018-10-09 +================================================== + +Initial plugin-ification. diff --git a/src/edwin/README b/src/edwin/README index 804f52a80..7e404490e 100644 --- a/src/edwin/README +++ b/src/edwin/README @@ -1,3 +1,31 @@ +The EDWIN option. + +This option extends Scheme with a source code (text) editor. It is +built in the GNU standard way: + + ./configure ... + make all + make check + make install + +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + +To use: call the global `edit' procedure, or specify --edit on the +Scheme command line. For more information see the MIT/GNU Scheme +User's Manual. + Notes on the Edwin sources: If you want to add a new file to the source tree, you need to @@ -16,7 +44,4 @@ If the file is to be autoloaded, you must edit the file: loadef.scm -So, in either case, you have to change four files in -"/scheme/v8/src/edwin". Of course, you also have to put a copy of -your file in "/scheme/v8/src/edwin", too, and you have to put a link -to the new file in "/scheme/v7/linux/edwin". +So, in either case, you have to change four files. diff --git a/src/edwin/TUTORIAL b/src/edwin/TUTORIAL new file mode 100644 index 000000000..86989cf4e --- /dev/null +++ b/src/edwin/TUTORIAL @@ -0,0 +1,786 @@ +Copyright (c) 1985 Free Software Foundation, Inc; See end for conditions. + +You are looking at the Emacs tutorial. It has been enhanced to +include features important to Edwin. + +Emacs commands generally involve the CONTROL key (sometimes labelled +CTRL or CTL) or the META key (sometimes labelled EDIT). Rather than +write out META or CONTROL each time we want you to prefix a character, +we'll use the following abbreviations: + + C- means hold the CONTROL key while typing the character + Thus, C-f would be: hold the CONTROL key and type f. + M- means hold the META or EDIT key down while typing . + If there is no META or EDIT key, type , release it, + then type the character . "" stands for the + key labelled "ALT" or "ESC". + +Important note: to end the Emacs session, type C-x C-c. (Two characters.) +The characters ">>" at the left margin indicate directions for you to +try using a command. For instance: +<> +>> Now type C-v (View next screen) to move to the next screen. + (go ahead, do it by depressing the control key and v together). + From now on, you'll be expected to do this whenever you finish + reading the screen. + +Note that there is an overlap when going from screen to screen; this +provides some continuity when moving through the file. + +The first thing that you need to know is how to move around from +place to place in the file. You already know how to move forward a +screen, with C-v. To move backwards a screen, type M-v (depress the +META key and type v, or type v if you don't have a META or EDIT +key). + +>> Try typing M-v and then C-v to move back and forth a few times. + + +SUMMARY +------- + +The following commands are useful for viewing screenfuls: + + C-v Move forward one screenful + M-v Move backward one screenful + C-l Clear screen and redisplay everything + putting the text near the cursor at the center. + (That's control-L, not control-1. + There is no such character as control-1.) + +>> Find the cursor and remember what text is near it. + Then type a C-l. + Find the cursor again and see what text is near it now. + + +BASIC CURSOR CONTROL +-------------------- + +Getting from screenful to screenful is useful, but how do you +reposition yourself within a given screen to a specific place? +There are several ways you can do this. One way (not the best, but +the most basic) is to use the commands Previous, Backward, Forward +and Next. As you can imagine these commands (which are given to +Emacs as C-p, C-b, C-f, and C-n respectively) move the cursor from +where it currently is to a new place in the given direction. Here, +in a more graphical form are the commands: + + (P)REVIOUS line, C-p + : + : + (B)ACKWARD, C-b .... Current cursor position .... (F)ORWARD, C-f + : + : + (N)EXT line, C-n + +>> Move the cursor to the line in the middle of that diagram + and type C-l to see the whole diagram centered in the screen. + +Rather than using these keys, you may find it easier at first to use +the cursor motion keys with the triangles on them (on the bottom right +of the keyboard). + +>> Move the cursor around using the cursor motion keys. + +>> Move into the line with C-f's and then up with C-p's. + See what C-p does when the cursor is in the middle of the line. + +Lines are separated by Newline characters. For most applications +there should normally be a Newline character at the end of the text, +as well, but it is up to you to make sure of this. A file can +validly exist without a Newline at the end. + +>> Try to C-b at the beginning of a line. Do a few more C-b's. + Then do C-f's back to the end of the line and beyond. + +When you go off the top or bottom of the screen, the text beyond +the edge is shifted onto the screen so that your instructions can +be carried out while keeping the cursor on the screen. + +>> Try to move the cursor off the bottom of the screen with C-n and + see what happens. + +If moving by characters is too slow, you can move by words. M-f +(Meta-f) moves forward a word and M-b moves back a word. + +>> Type a few M-f's and M-b's. Intersperse them with C-f's and C-b's. + +Notice the parallel between C-f and C-b on the one hand, and M-f and +M-b on the other hand. Very often Meta characters are used for +operations related to English text whereas Control characters operate +on the basic textual units that are independent of what you are +editing (characters, lines, etc). There is a similar parallel between +lines and sentences: C-a and C-e move to the beginning or end of a +line, and M-a and M-e move to the beginning or end of a sentence. + +>> Try a couple of C-a's, and then a couple of C-e's. + Try a couple of M-a's, and then a couple of M-e's. + +See how repeated C-a's do nothing, but repeated M-a's keep moving +farther. Do you think that this is right? + +Two other simple cursor motion commands are M-< (Meta Less-than), +which moves to the beginning of the file, and M-> (Meta Greater-than), +which moves to the end of the file. You probably don't need to try +them, since finding this spot again will be boring. On most terminals +the "<" is above the comma and you must use the shift key to type it. +On these terminals you must use the shift key to type M-< also; +without the shift key, you would be typing M-comma. + +The location of the cursor in the text is also called "point". To +paraphrase, the cursor shows on the screen where point is located in +the text. + +Here is a summary of simple moving operations including the word and +sentence moving commands: + + C-f Move forward a character + C-b Move backward a character + + M-f Move forward a word + M-b Move backward a word + + C-n Move to next line + C-p Move to previous line + + C-a Move to beginning of line + C-e Move to end of line + + M-a Move back to beginning of sentence + M-e Move forward to end of sentence + + M-< Go to beginning of file + M-> Go to end of file + +>> Try all of these commands now a few times for practice. + Since the last two will take you away from this screen, + you can come back here with M-v's and C-v's. These are + the most often used commands. + +Like all other commands in Emacs, these commands can be given +arguments which cause them to be executed repeatedly. The way you +give a command a repeat count is by typing C-u and then the digits +before you type the command. If you have a META or EDIT key, you can +omit the C-u if you hold down the META or EDIT key while you type the +digits. This is easier, but we recommend the C-u method because it +works on any terminal. + +For instance, C-u 8 C-f moves forward eight characters. + +>> Try giving a suitable argument to C-n or C-p to come as close + as you can to this line in one jump. + +The only apparent exception to this is the screen moving commands, +C-v and M-v. When given an argument, they scroll the screen up or +down by that many lines, rather than screenfuls. This proves to be +much more useful. + +>> Try typing C-u 8 C-v now. + +Did it scroll the screen up by 8 lines? If you would like to +scroll it down you can give an argument to M-v. + + +STOPPING EDWIN +-------------- + +If you incorrectly type a command, C-g will quit what it was doing +and allow you to enter it in again from scratch. Use C-g to discard +a numeric argument or the beginning of a command that you don't want +to finish. In Scheme or REPL mode, you can cancel a Scheme +evaluation by typing C-c C-c. You can tell if Scheme is evaluating +something by looking at the run-light for the word Eval instead of +Listen. + +>> Type C-u 100 to make a numeric arg of 100, then type C-g. + Now type C-f. How many characters does it move? + If you have typed an by mistake, you can get rid of it + with a C-g. + + +INSERTING AND DELETING +---------------------- + +If you want to insert text, just type it. Characters which you can +see, such as A, 7, *, etc. are taken by Emacs as text and inserted +immediately. Type (the carriage-return key) to insert a +Newline character. + +You can delete the last character you typed by typing . +More generally, deletes the character immediately before the +current cursor position. + +>> Do this now, type a few characters and then delete them + by typing a few times. Don't worry about this file + being changed; you won't affect the master tutorial. This is just + a copy of it. + +>> Now start typing text until you reach the right margin, and keep + typing. When a line of text gets too big for one line on the + screen, the line of text is "continued" onto a second screen line. + The backslash at the right margin indicates a line which has + been continued. +>> Use to delete the text until the line fits on one screen + line again. The continuation line goes away. + +>> Move the cursor to the beginning of a line and type . + This deletes the newline before the line and merges the line onto the + previous line. The resulting line may be too long to fit, in which + case it has a continuation line. + +>> Type to reinsert the Newline you deleted. + +Remember that most Emacs commands can be given a repeat count; +this includes characters which insert themselves. + +>> Try that now -- type C-u 8 * and see what happens. + +You've now learned the most basic way of typing something in +Emacs and correcting errors. You can delete by words or lines +as well. Here is a summary of the delete operations: + + delete the character just before the cursor + C-d delete the next character after the cursor + + M- kill the word immediately before the cursor + M-d kill the next word after the cursor + + C-k kill from the cursor position to end of line + M-k kill to the end of the current sentence + +Notice that and C-d vs M- and M-d extend the parallel +started by C-f and M-f (well, isn't really a control +character, but let's not worry about that). C-k and M-k are like C-e +and M-e, sort of, in that lines are opposite sentences. + +Now suppose you kill something, and then you decide that you want to +get it back? Well, whenever you kill something bigger than a +character, Emacs saves it for you. To yank it back, use C-y. You +can kill text in one place, move elsewhere, and then do C-y; this is +a good way to move text around. Note that the difference +between "Killing" and "Deleting" something is that "Killed" things +can be yanked back, and "Deleted" things cannot. Generally, the +commands that can destroy a lot of text save it, while the ones that +attack only one character, or nothing but blank lines and spaces, do +not save. + +For instance, type C-n a couple times to postion the cursor +at some line on this screen. + +>> Do this now, move the cursor and kill that line with C-k. + +Note that a single C-k kills the contents of the line, and a second +C-k kills the line itself, and make all the other lines move up. If +you give C-k a repeat count, it kills that many lines AND their +contents. + +The text that has just disappeared is saved so that you can +retrieve it. To retrieve the last killed text and put it where +the cursor currently is, type C-y. + +>> Try it; type C-y to yank the text back. + +Think of C-y as if you were yanking something back that someone +took away from you. Notice that if you do several C-k's in a row +the text that is killed is all saved together so that one C-y will +yank all of the lines. + +>> Do this now, type C-k several times. + +Now to retrieve that killed text: + +>> Type C-y. Then move the cursor down a few lines and type C-y + again. You now see how to copy some text. + +What do you do if you have some text you want to yank back, and then +you kill something else? C-y would yank the more recent kill. But +the previous text is not lost. You can get back to it using the M-y +command. After you have done C-y to get the most recent kill, typing +M-Y replaces that yanked text with the previous kill. Typing M-y +again and again brings in earlier and earlier kills. When you +have reached the text you are looking for, you can just go away and +leave it there. If you M-y enough times, you come back to the +starting point (the most recent kill). + +>> Kill a line, move around, kill another line. + Then do C-y to get back the second killed line. + Then do M-y and it will be replaced by the first killed line. + Do more M-y's and see what you get. Keep doing them until + the second kill line comes back, and then a few more. + If you like, you can try giving M-y positive and negative + arguments. + + +Evaluating Scheme Expressions +----------------------------- + +Now that you can insert characters, you can type expressions and have +them evaluated. Read through this sequence of steps and then try +them out. + + 1. Type: C-x b *scheme* to get into an evaluation buffer. + + 2. Type: (+ 1 5) + + 3. Type: C-x C-e to evaluate the expression. Make sure the point +is after the closing paren. + + 4. Notice that the result is always printed into the *scheme* +buffer. + + 5. Type: M-p to access the history. Change a 5 to a 10 and +evaluate the new expression agian. + + 6. Type: C-x b TUTORIAL to get back to this screen. + +>> Now try these steps out. + +UNDO +---- + +Any time you make a change to the text and wish you had not done so, +you can undo the change (return the text to its previous state) +with the undo command, C-x u. Normally, C-x u undoes one command's +worth of changes; if you repeat the C-x u several times in a row, +each time undoes one more command. There are two exceptions: +commands that made no change (just moved the cursor) do not count, +and self-inserting characters are often lumped together in groups +of up to 20. This is to reduce the number of C-x u's you have to type. + +>> Kill this line with C-k, then type C-x u and it should reappear. + +C-_ is another command for undoing; it is just the same as C-x u +but easier to type several times in a row. The problem with C-_ is +that on some keyboards it is not obvious how to type it. That is +why C-x u is provided as well. On some DEC terminals, you can type +C-_ by typing / while holding down CTRL. Illogical, but what can +you expect from DEC? + +Giving a numeric argument to C-_ or C-x u is equivalent to repeating +it as many times as the argument says. + + +FILES +----- + +In order to make the text you edit permanent, you must put it in a +file. Otherwise, it will go away when your invocation of Emacs goes +away. You put your editing in a file by "finding" the file. What +finding means is that you see the contents of the file in your Emacs; +and, loosely speaking, what you are editing is the file itself. +However, the changes still don't become permanent until you "save" the +file. This is so you can have control to avoid leaving a half-changed +file around when you don't want to. Even then, Emacs leaves the +original file under a changed name in case your changes turn out +to be a mistake. + +If you look near the bottom of the screen you will see a line that +begins and ends with dashes, and contains the string "Edwin: TUTORIAL". +Your copy of the Emacs tutorial is called "TUTORIAL". Whatever +file you find, that file's name will appear in that precise +spot. + +The commands for finding and saving files are unlike the other +commands you have learned in that they consist of two characters. +They both start with the character Control-x. There is a whole series +of commands that start with Control-x; many of them have to do with +files, buffers, and related things, and all of them consist of +Control-x followed by some other character. + +Another thing about the command for finding a file is that you have +to say what file name you want. We say the command "reads an argument +from the terminal" (in this case, the argument is the name of the +file). After you type the command + + C-x C-f Find a file + +Emacs asks you to type the file name. It echoes on the bottom +line of the screen. You are using the minibuffer now! this is +what the minibuffer is for. When you type to end the +file name, the minibuffer is no longer needed, so it disappears. + +>> Type C-x C-f, then type C-g. This cancels the minibuffer, + and also cancels the C-x C-f command that was using the + minibuffer. So you do not find any file. + +In a little while the file contents appear on the screen. You can +edit the contents. When you wish to make the changes permanent, +issue the command + + C-x C-s Save the file + +The contents of Emacs are written into the file. The first time you +do this, the original file is renamed to a new name so that it +is not lost. The new name is made by appending "~" to the end +of the original file's name. + +When saving is finished, Emacs prints the name of the file written. +You should save fairly often, so that you will not lose very much +work if the system should crash. + +>> Type C-x C-s, saving your copy of the tutorial. + This should print "Wrote .../TUTORIAL" at the bottom of the screen. + On VMS it will print "Wrote ...[...]TUTORIAL." + +To make a new file, just find it "as if" it already existed. Then +start typing in the text. When you ask to "save" the file, Emacs +will really create the file with the text that you have inserted. +From then on, you can consider yourself to be editing an already +existing file. + + +BUFFERS +------- + +If you find a second file with C-x C-f, the first file remains +inside Emacs. You can switch back to it by finding it again with +C-x C-f. This way you can get quite a number of files inside Emacs. + +The object inside Emacs which holds the text read from one file +is called a "buffer." Finding a file makes a new buffer inside Emacs. +To see a list of the buffers that exist in Emacs, type + + C-x C-b List buffers + +>> Try C-x C-b now. + +See how each buffer has a name, and it may also have a file name +for the file whose contents it holds. Some buffers do not correspond +to files. For example, the buffer named "*Buffer List*" does +not have any file. It is the buffer which contains the buffer +list that was made by C-x C-b. ANY text you see in an Emacs window +has to be in some buffer. + +>> Type C-x 1 to get rid of the buffer list. + +If you make changes to the text of one file, then find another file, +this does not save the first file. Its changes remain inside Emacs, +in that file's buffer. The creation or editing of the second file's +buffer has no effect on the first file's buffer. This is very useful, +but it also means that you need a convenient way to save the first +file's buffer. It would be a nuisance to have to switch back to +it with C-x C-f in order to save it with C-x C-s. So we have + + C-x s Save some buffers + +C-x s goes through the list of all the buffers you have +and finds the ones that contain files you have changed. +For each such buffer, C-x s asks you whether to save it. + + +EXTENDING THE COMMAND SET +------------------------- + +There are many, many more Emacs commands than could possibly be put +on all the control and meta characters. Emacs gets around this with +the X (eXtend) command. This comes in two flavors: + + C-x Character eXtend. Followed by one character. + M-x Named command eXtend. Followed by a long name. + +These are commands that are generally useful but used less than the +commands you have already learned about. You have already seen two +of them: the file commands C-x C-f to Find and C-x C-s to Save. +Another example is the command to tell Emacs that you'd like to stop +editing and get rid of Emacs. The command to do this is C-x C-c. +(Don't worry; it offers to save each changed file before it kills the +Emacs.) + +C-z is the usual way to exit Emacs, because it is always better not to +kill the Emacs if you are going to do any more editing. On systems +which allow it, C-z exits from Emacs to the shell but does not destroy +the Emacs; if you use the C shell, you can resume Emacs with the `fg' +command (or, more generally, with `%emacs', which works even if your +most recent job was some other). On systems where suspending is not +possible, C-z creates a subshell running under Emacs to give you the +chance to run other programs and return to Emacs afterward, but it +does not truly "exit" from Emacs. In this case, the shell command +`exit' is the usual way to get back to Emacs from the subshell. + +You would use C-x C-c if you were about to log out. You would +also use it to exit an Emacs invoked under mail handling programs +and other random utilities, since they may not believe you have +really finished using the Emacs if it continues to exist. + +There are many C-x commands. The ones you know are: + + C-x C-f Find file. + C-x C-s Save file. + C-x C-b List buffers. + C-x C-c Quit Emacs. + C-x u Undo. + +Named eXtended commands are commands which are used even less +frequently, or commands which are used only in certain modes. These +commands are usually called "functions". An example is the function +replace-string, which globally replaces one string with another. When +you type M-x, Emacs prompts you at the bottom of the screen with +M-x and you should type the name of the function you wish to call; in +this case, "replace-string". Just type "repl s" and Emacs will +complete the name. End the command name with . +Then type the two "arguments"--the string to be replaced, and the string +to replace it with--each one ended with a Return. + +>> Move the cursor to the blank line two lines below this one. + Then type M-x repla schangedaltered. + + Notice how this line has changed: you've replaced + the word c-h-a-n-g-e-d with "altered" wherever it occured + after the cursor. + + +MODE LINE +--------- + +If Emacs sees that you are typing commands slowly it shows them to you +at the bottom of the screen in an area called the "echo area." The echo +area contains the bottom line of the screen. The line immediately above +it is called the MODE LINE. The mode line says something like + +--**--Emacs: TUTORIAL (Fundamental)----58%------------- + +This is a very useful "information" line. + +You already know what the filename means--it is the file you have +found. What the --NN%-- means is that NN percent of the file is +above the top of the screen. If the top of the file is on the screen, +it will say --TOP-- instead of --00%--. If the bottom of the file is +on the screen, it will say --BOT--. If you are looking at a file so +small it all fits on the screen, it says --ALL--. + +The stars near the front mean that you have made changes to the text. +Right after you visit or save a file, there are no stars, just dashes. + +The part of the mode line inside the parentheses is to tell you what +modes you are in. The default mode is Fundamental which is what you +are in now. It is an example of a "major mode". There are several +major modes in Emacs for editing different languages and text, such +as Scheme mode, Text mode, etc. At any time one and only one major +mode is active, and its name can always be found in the mode line +just where "Fundamental" is now. Each major mode makes a few +commands behave differently. For example, there are commands for +creating comments in a program, and since each programming language +has a different idea of what a comment should look like, each major +mode has to insert comments differently. Each major mode is the name +of an extended command, which is how you get into the mode. For +example, M-X fundamental-mode is how to get into Fundamental mode. + +If you are going to be editing Scheme code, you should probably use +Text Mode. + +>> Type M-x scheme-mode. + +To get documentation on your current major mode, type C-h m. + +>> Use C-u C-v once or more to bring this line near the top of screen. +>> Type C-h m, to see how Scheme mode differs from Fundamental mode. +>> Type C-x 1 to remove the documentation from the screen. + +Major modes are called major because there are also minor modes. +They are called minor because they aren't alternatives to the major +modes, just minor modifications of them. Each minor mode can be +turned on or off by itself, regardless of what major mode you are in, +and regardless of the other minor modes. So you can use no minor +modes, or one minor mode, or any combination of several minor modes. + +SEARCHING +--------- + +Emacs can do searches for strings (these are groups of contiguous +characters or words) either forward through the file or backward +through it. To search for the string means that you are trying to +locate it somewhere in the file and have Emacs show you where the +occurrences of the string exist. This type of search is somewhat +different from what you may be familiar with. It is a search that is +performed as you type in the thing to search for. The command to +initiate a search is C-s for forward search, and C-r for reverse +search. BUT WAIT! Don't do them now. When you type C-s you'll +notice that the string "I-search" appears as a prompt in the echo +area. This tells you that Emacs is in what is called an incremental +search waiting for you to type the thing that you want to search for. + terminates a search. + +>> Now type C-s to start a search. SLOWLY, one letter at a time, + type the word 'cursor', pausing after you type each + character to notice what happens to the cursor. +>> Type C-s to find the next occurrence of "cursor". +>> Now type four times and see how the cursor moves. +>> Type to terminate the search. + +Did you see what happened? Emacs, in an incremental search, tries to +go to the occurrence of the string that you've typed out so far. To go +to the next occurrence of 'cursor' just type C-s again. If no such +occurrence exists Emacs beeps and tells you that it is a failing +search. C-g would also terminate the search. + +If you are in the middle of an incremental search and type , +you'll notice that the last character in the search string is erased +and the search backs up to the last place of the search. For +instance, suppose you currently have typed 'cu' and you see that your +cursor is at the first occurrence of 'cu'. If you now type , +the 'u' on the search line is erased and you'll be repositioned in the +text to the occurrence of 'c' where the search took you before you +typed the 'u'. This provides a useful means for backing up while you +are searching. + +If you are in the middle of a search and happen to type a control +character (other than a C-s or C-r, which tell Emacs to search for the +next occurrence of the string), the search is terminated. + +The C-s starts a search that looks for any occurrence of the search +string AFTER the current cursor position. But what if you want to +search for something earlier in the text? To do this, type C-r for +Reverse search. Everything that applies to C-s applies to C-r except +that the direction of the search is reversed. + + +RECURSIVE EDITING LEVELS +------------------------ + +Sometimes you will get into what is called a "recursive editing +level". This is indicated by square brackets in the mode line, +surrounding the parentheses around the major mode name. For +example, you might see [(Fundamental)] instead of (Fundamental). + +To get out of the recursive editing level, type + M-x top-level. + +>> Try that now; it should display "Back to top level" + at the bottom of the screen. + +In fact, you were ALREADY at top level (not inside a recursive editing +level) if you have obeyed instructions. M-x top-level does not care; +it gets out of any number of recursive editing levels, perhaps zero, +to get back to top level. + +You can't use C-g to get out of a recursive editing level because C-g +is used for discarding numeric arguments and partially typed commands +WITHIN the recursive editing level. + + +WINDOWS +------- + +Emacs can have several windows, each displaying its own text. +At this stage it is better not to go into the techniques of +using multiple windows. But you do need to know how to get +rid of extra windows that may appear to display help or +output from certain commands. It is simple: + + C-x 1 One window (i.e., kill all other windows). + +That is Control-x followed by the digit 1. +C-x 1 makes the window which the cursor is in become +the full screen, by getting rid of any other windows. + +>> Move the cursor to this line and type C-u 0 C-l. +>> Type Control-h k Control-f. + See how this window shrinks, while a new one appears + to display documentation on the Control-f command. + +>> Type C-x 1 and see the documentation listing window disappear. + + +GETTING MORE HELP +----------------- + +In this tutorial we have tried to supply just enough information to +get you started using Emacs. There is so much available in Emacs that +it would be impossible to explain it all here. However, you may want +to learn more about Emacs since it has numerous desirable features +that you don't know about yet. Emacs has a great deal of internal +documentation. All of these commands can be accessed through +the character Control-h, which we call "the Help character" +because of the function it serves. + +To use the HELP features, type the C-h character, and then a +character saying what kind of help you want. If you are REALLY lost, +type C-h ? and Emacs will tell you what kinds of help it can give. +If you have typed C-h and decide you don't want any help, just +type C-G to cancel it. + +The most basic HELP feature is C-h c. Type C-h, a c, and a +command character or sequence, and Emacs displays a very brief +description of the command. + +>> Type C-h c Control-p. + The message should be something like + + C-p runs the command previous-line + +This tells you the "name of the function". That is important in +writing Lisp code to extend Emacs; it also is enough to remind +you of what the command does if you have seen it before but did +not remember. + +Multi-character commands such as C-x C-s and (if you have no META or +EDIT key) v are also allowed after C-h c. + +To get more information on the command, use C-h k instead of C-h c. + +>> Type C-h k Control-p. + +This displays the documentation of the function, as well as its name, +in an Emacs window. When you are finished reading the output, type +C-x 1 to get rid of the help text. You do not have to do this right +away. You can do some editing based on the help text before you type +C-x 1. + +Here are some other useful C-h options: + + C-h f Describe a function. You type in the name of the + function. + +>> Try typing C-h f previous-line. + This prints all the information Emacs has about the + function which implements the C-P command. + + C-h a Command Apropos. Type in a keyword and Emacs will list + all the commands whose names contain that keyword. + These commands can all be invoked with Meta-x. + For some commands, Command Apropos will also list a one + or two character sequence which has the same effect. + +>> Type C-h a file. You will see a list of all M-x commands +with "file" in their names. You will also see commands +like C-x C-f and C-x C-w, listed beside the command names +find-file and write-file. + + +CONCLUSION +---------- + +Remember, to exit Emacs permanently use C-x C-c. To exit to a shell +temporarily, so that you can come back in, use C-z. + +This tutorial is meant to be understandable to all new users, so if +you found something unclear, don't sit and blame yourself - complain! + + +COPYING +------- + +This tutorial descends from a long line of Emacs tutorials +starting with the one written by Stuart Cracraft for the original Emacs. + +This version of the tutorial, like GNU Emacs, is copyrighted, and +comes with permission to distribute copies on certain conditions: + +Copyright (c) 1985 Free Software Foundation + + Permission is granted to anyone to make or distribute verbatim copies + of this document as received, in any medium, provided that the + copyright notice and permission notice are preserved, + and that the distributor grants the recipient permission + for further redistribution as permitted by this notice. + + Permission is granted to distribute modified versions + of this document, or of portions of it, + under the above conditions, provided also that they + carry prominent notices stating who last altered them. + +The conditions for copying Emacs itself are slightly different +but in the same spirit. Please read the file COPYING and then +do give copies of GNU Emacs to your friends. +Help stamp out software obstructionism ("ownership") by using, +writing, and sharing free software! diff --git a/src/edwin/autogen.sh b/src/edwin/autogen.sh new file mode 100755 index 000000000..297d46ab5 --- /dev/null +++ b/src/edwin/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e +./sources.sh deps >source-dependencies.am +autoreconf --force --install diff --git a/src/edwin/compile.sh b/src/edwin/compile.sh new file mode 100755 index 000000000..c63e39c4c --- /dev/null +++ b/src/edwin/compile.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# -*-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 +# 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 +# your option) any later version. +# +# MIT/GNU Scheme 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. +# +# You should have received a copy of the GNU General Public License +# along with MIT/GNU Scheme; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +# USA. + +# Compile the Edwin option. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --batch-mode <<\EOF + +(begin + (load "edwin.sf") + (load "edwin.cbf")) +EOF +suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` +report=edwin-$suffix.crf +if [ -s "$report" ]; then + awk "{printf \"$report:%d: %s\\n\",NR,\$0}" $report +fi diff --git a/src/edwin/configure.ac b/src/edwin/configure.ac new file mode 100644 index 000000000..484b14542 --- /dev/null +++ b/src/edwin/configure.ac @@ -0,0 +1,58 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT([MIT/GNU Scheme Edwin], + [3.117], + [bug-mit-scheme@gnu.org], + [mit-scheme-edwin]) +AC_CONFIG_SRCDIR([edwin.pkg]) + +AC_COPYRIGHT( +[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 + +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 +your option) any later version. + +MIT/GNU Scheme 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. + +You should have received a copy of the GNU General Public License +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA. +]) + +AM_INIT_AUTOMAKE + +AC_PROG_INSTALL + +MIT_SCHEME_PROJECT=mit-scheme +: ${MIT_SCHEME_EXE=mit-scheme} +MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` +MIT_SCHEME_SOURCES=`./sources.sh scm` +MIT_SCHEME_BINARIES=`./sources.sh com` + +# Install plugin docs in Scheme's docdir subdirectories. +htmldir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/html' +pdfdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/pdf' + +AC_SUBST([MIT_SCHEME_PROJECT]) +AC_SUBST([MIT_SCHEME_SOURCES]) +AC_SUBST([MIT_SCHEME_BINARIES]) +AC_SUBST([MIT_SCHEME_EXE]) +AC_SUBST([MIT_SCHEME_LIBDIR]) +AC_SUBST([MIT_SCHEME_OS_SUFFIX]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/src/edwin/editor.scm b/src/edwin/editor.scm index b1de7d0ef..bb584615e 100644 --- a/src/edwin/editor.scm +++ b/src/edwin/editor.scm @@ -89,15 +89,6 @@ USA. ,@operations)) message)))))))) -(define (edwin . args) (apply edit args)) -(simple-command-line-parser "edit" edit - "Causes Edwin to start immediately after Scheme.") - -(define (spawn-edwin . args) - (let ((thread (create-thread #f (lambda () (apply edwin args))))) - (detach-thread thread) - thread)) - (define edwin-editor #f) (define editor-abort) (define current-editor) diff --git a/src/edwin/edwin.pkg b/src/edwin/edwin.pkg index 597e370e2..ac04bb3aa 100644 --- a/src/edwin/edwin.pkg +++ b/src/edwin/edwin.pkg @@ -26,8 +26,10 @@ USA. ;;;; Edwin Packaging -(global-definitions "../runtime/runtime") -(global-definitions "../xml/xml") +(global-definitions runtime/) +(global-definitions xml/) +(global-definitions blowfish/) +(global-definitions gdbm/) (define-package (edwin) (files "utils" @@ -120,16 +122,31 @@ USA. (port/output-channel output-port-channel) (port/state textual-port-state) generic-port-operation:write-substring) + (import (blowfish) + blowfish-encrypt-port + blowfish-file? + read-blowfish-file-header + write-blowfish-file-header) + (import (gdbm) + gdbm-close + gdbm-delete + gdbm-exists? + gdbm-fetch + gdbm-firstkey + gdbm-nextkey + gdbm-open + gdbm-reorganize + gdbm-store + gdbm_fast + gdbm_replace + gdbm_wrcreat) (export () create-editor create-editor-args - edit - edwin inhibit-editor-init-file? reset-editor reset-editor-windows - (save-editor-files debug-save-files) - spawn-edwin) + (save-editor-files debug-save-files)) (export (edwin class-macros) class-instance-transforms)) diff --git a/src/edwin/edwin.sf b/src/edwin/edwin.sf index 62730dc05..87522d795 100644 --- a/src/edwin/edwin.sf +++ b/src/edwin/edwin.sf @@ -25,11 +25,14 @@ USA. |# (load-option 'cref) +(load-option 'xml) +(load-option 'blowfish) +(load-option 'gdbm) (if (not (name->package '(edwin))) (let ((package-set (package-set-pathname "edwin"))) (if (not (file-exists? package-set)) - (cref/generate-trivial-constructor "edwin")) + (cref/generate-trivial-constructor "edwin" #f)) (construct-packages-from-file (fasload package-set)))) (if (lexical-unreferenceable? (->environment '(edwin string)) @@ -84,5 +87,5 @@ USA. (load "decls") -(cref/generate-constructors "edwin" 'all) +(cref/generate-constructors "edwin") (sf-conditionally "edwin.ldr") \ No newline at end of file diff --git a/src/edwin/filcom.scm b/src/edwin/filcom.scm index fb6c778b5..281f6004c 100644 --- a/src/edwin/filcom.scm +++ b/src/edwin/filcom.scm @@ -653,7 +653,8 @@ Prefix arg means treat the plaintext file as binary data." (blowfish-decrypt-file from to binary-plaintext? #f))) (define (guarantee-blowfish-available) - (if (not (blowfish-available?)) + (if (not (ignore-errors (lambda () (load-option 'blowfish)) + (lambda (condition) condition #f))) (editor-error "Blowfish encryption not supported on this system."))) (define (blowfish-encrypt-file from to binary-plaintext? delete-plaintext?) diff --git a/src/edwin/fileio.scm b/src/edwin/fileio.scm index cef783b94..a5474aae4 100644 --- a/src/edwin/fileio.scm +++ b/src/edwin/fileio.scm @@ -40,8 +40,8 @@ filename suffix \".bf\"." (define ((read/write-encrypted-file? write?) group pathname) (and (ref-variable enable-encrypted-files group) (equal? "bf" (pathname-type pathname)) - (md5-available?) - (blowfish-available?) + (ignore-errors (lambda () (load-option 'blowfish)) + (lambda (condition) condition #f)) (or write? (blowfish-file? pathname)) #t)) diff --git a/src/edwin/make.scm b/src/edwin/make.scm index e76c186b2..d1cdee9ff 100644 --- a/src/edwin/make.scm +++ b/src/edwin/make.scm @@ -28,9 +28,12 @@ USA. (declare (usual-integrations)) +(load-option 'xml) +(load-option 'blowfish) +(load-option 'gdbm) (with-loader-base-uri (system-library-uri "edwin/") (lambda () (load-package-set "edwin" `((alternate-package-loader . ,(load "edwin.bld" system-global-environment)))))) -(add-subsystem-identification! "Edwin" '(3 116)) \ No newline at end of file +(add-subsystem-identification! "Edwin" '(3 117)) \ No newline at end of file diff --git a/src/edwin/nntp.scm b/src/edwin/nntp.scm index 400c552fd..28ba41ec2 100644 --- a/src/edwin/nntp.scm +++ b/src/edwin/nntp.scm @@ -37,8 +37,6 @@ USA. ;;; method for combining headers into conversation threads. (declare (usual-integrations)) - -(load-option 'GDBM) ;;;; NNTP Connection @@ -532,7 +530,8 @@ USA. (news-group:%last-article group)))) (define (news-group:use-gdbm? group type) - (and (gdbm-available?) + (and (ignore-errors (lambda () (load-option 'GDBM)) + (lambda (condition) condition #f)) (memq type (news-group:%use-gdbm? group)))) (define (set-news-group:use-gdbm! group types) diff --git a/src/edwin/sources.sh b/src/edwin/sources.sh new file mode 100755 index 000000000..aa2c720b2 --- /dev/null +++ b/src/edwin/sources.sh @@ -0,0 +1,89 @@ +#!/bin/sh +# -*-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 +# 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 +# your option) any later version. +# +# MIT/GNU Scheme 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. +# +# You should have received a copy of the GNU General Public License +# along with MIT/GNU Scheme; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +# USA. + +# Generate a list of all source files. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --batch-mode -- $1 <<\EOF +(begin + + (define (filenames) + '("abbrev" "ansi" "argred" "artdebug" "autold" "autosv" "basic" + "bios" "bufcom" "buffer" "buffrm" "bufinp" "bufmnu" "bufout" + "bufset" "bufwfs" "bufwin" "bufwiu" "bufwmc" "c-mode" "calias" + "cinden" "class" "clscon" "clsmac" "comatch" "comhst" "comint" + "comman" "compile" "comred" "comtab" "comwin" "curren" "dabbrev" + "debian-changelog" "debug" "debuge" "diff" "dired" "dirunx" + "dirw32" "display" "docstr" "dos" "doscom" "dosfile" "dosproc" + "dosshell" "ed-ffi" "editor" "edtfrm" "edtstr" "evlcom" "eystep" + "filcom" "fileio" "fill" "grpops" "hlpcom" "htmlmode" "image" + "info" "input" "intmod" "iserch" "javamode" "key-w32" "keymap" + "keyparse" "kilcom" "kmacro" "lincom" "linden" "lisppaste" + "loadef" "lspcom" "macros" "make" "malias" "manual" "midas" + "modefs" "modes" "modlin" "modwin" "motcom" "motion" "mousecom" + "nntp" "notify" "nvector" "occur" "outline" "paredit" "pasmod" + "paths" "print" "process" "prompt" "pwedit" "pwparse" "rcsparse" + "reccom" "regcom" "regexp" "regops" "replaz" "rfc822" + "ring" "rmail" "rmailsrt" "rmailsum" "schmod" "scrcom" "screen" + "search" "sendmail" "sercom" "shell" "simple" "snr" "sort" + "string" "strpad" "strtab" "struct" "syntax" "tagutl" "techinfo" + "telnet" "termcap" "texcom" "things" "tparse" "tterm" "tximod" + "txtprp" "undo" "unix" "utils" "utlwin" "vc" "vc-bzr" "vc-cvs" + "vc-git" "vc-rcs" "vc-svn" "verilog" "vhdl" "webster" "win32" + "win32com" "wincom" "window" "winout" "world-monitor" + "xform" "xterm")) + + (define (my-write . strings) + (for-each write-string strings)) + + (define (my-write-line . strings) + (apply my-write strings) (newline)) + + (let ((command (car (if (environment-bound? system-global-environment + 'command-line-arguments) + (command-line-arguments) + (command-line)))) + (files (filenames))) + (cond ((string=? command "scm") + (for-each (lambda (name) (my-write " "name)) + (sort (map (lambda (pathname) + (->namestring (pathname-new-type pathname "scm"))) + files) + stringnamestring files) stringnamestring files) string + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307 USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/src/imail/ChangeLog b/src/imail/ChangeLog new file mode 100644 index 000000000..98d81439b --- /dev/null +++ b/src/imail/ChangeLog @@ -0,0 +1,7 @@ +-*-Text-*- + +Please see the git commit log: + +$ git clone git://git.savannah.gnu.org/mit-scheme.git whatever +$ cd whatever/ +$ git log origin/master -- src/imail/ | more diff --git a/src/imail/Makefile-fragment b/src/imail/Makefile-fragment deleted file mode 100644 index b43784c72..000000000 --- a/src/imail/Makefile-fragment +++ /dev/null @@ -1,7 +0,0 @@ -IMAIL_DIR = $(AUXDIR)/imail - -install: - $(mkinstalldirs) $(DESTDIR)$(IMAIL_DIR) - $(INSTALL_COM) *.com $(DESTDIR)$(IMAIL_DIR)/. - $(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(IMAIL_DIR)/. - $(INSTALL_DATA) $(srcdir)/load.scm $(DESTDIR)$(IMAIL_DIR)/. diff --git a/src/imail/Makefile.am b/src/imail/Makefile.am new file mode 100644 index 000000000..cf40c0355 --- /dev/null +++ b/src/imail/Makefile.am @@ -0,0 +1,120 @@ +## 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 +## +## 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 +## your option) any later version. +## +## MIT/GNU Scheme 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. +## +## You should have received a copy of the GNU General Public License +## along with MIT/GNU Scheme; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +## USA. + +EXTRA_DIST = autogen.sh + +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ +scmlibdir = @MIT_SCHEME_LIBDIR@ +scmlib_subdir = $(scmlibdir)imail +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ + +sources = imail-browser.scm imail-core.scm imail-file.scm imail-imap.scm +sources += imail-mime.scm imail-rmail.scm imail-summary.scm imail-top.scm +sources += imail-umail.scm imail-util.scm imap-response.scm imap-syntax.scm + +binaries = imail-browser.bci imail-browser.com +binaries += imail-core.bci imail-core.com +binaries += imail-file.bci imail-file.com +binaries += imail-imap.bci imail-imap.com +binaries += imail-mime.bci imail-mime.com +binaries += imail-rmail.bci imail-rmail.com +binaries += imail-summary.bci imail-summary.com +binaries += imail-top.bci imail-top.com +binaries += imail-umail.bci imail-umail.com +binaries += imail-util.bci imail-util.com +binaries += imap-response.bci imap-response.com +binaries += imap-syntax.bci imap-syntax.com + +scmlib_sub_DATA = $(sources) +scmlib_sub_DATA += $(binaries) +scmlib_sub_DATA += make.scm imail.pkg imail-@MIT_SCHEME_OS_SUFFIX@.pkd + +info_TEXINFOS = mit-scheme-imail.texi +AM_MAKEINFOHTMLFLAGS = --no-split + +imail-browser.bci: stamp-scheme +imail-browser.com: stamp-scheme +imail-core.bci: stamp-scheme +imail-core.com: stamp-scheme +imail-file.bci: stamp-scheme +imail-file.com: stamp-scheme +imail-imap.bci: stamp-scheme +imail-imap.com: stamp-scheme +imail-mime.bci: stamp-scheme +imail-mime.com: stamp-scheme +imail-rmail.bci: stamp-scheme +imail-rmail.com: stamp-scheme +imail-summary.bci: stamp-scheme +imail-summary.com: stamp-scheme +imail-top.bci: stamp-scheme +imail-top.com: stamp-scheme +imail-umail.bci: stamp-scheme +imail-umail.com: stamp-scheme +imail-util.bci: stamp-scheme +imail-util.com: stamp-scheme +imap-response.bci: stamp-scheme +imap-response.com: stamp-scheme +imap-syntax.bci: stamp-scheme +imap-syntax.com: stamp-scheme +imail-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +stamp-scheme: $(sources) imail.pkg + touch stamp-scheme + if ! ./compile.sh; then rm stamp-scheme; exit 1; fi + +CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd +CLEANFILES += stamp-scheme + +#TESTS = imail-check.sh + +ETAGS_ARGS = $(sources) +TAGS_DEPENDENCIES = $(sources) + +EXTRA_DIST += $(sources) compile.sh make.scm compile.scm imail.pkg + +install-data-hook: + ( echo '(add-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + ( echo '(add-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-info-am: + +uninstall-info-am: + +uninstall-hook: + ( echo '(remove-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \ + echo ' ""'; \ + echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + | $(MIT_SCHEME_EXE) --batch-mode + [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ + && rmdir "$(DESTDIR)$(scmlib_subdir)" diff --git a/src/imail/NEWS b/src/imail/NEWS new file mode 100644 index 000000000..eddcebd22 --- /dev/null +++ b/src/imail/NEWS @@ -0,0 +1,28 @@ +mit-scheme-imail NEWS -- history of user-visible changes. + +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 + +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 your option) any later version. + +MIT/GNU Scheme 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. + +You should have received a copy of the GNU General Public License +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301, USA. + +mit-scheme-imail 1.22 - Matt Birkholz, 2018-10-09 +================================================= + +Initial plugin-ification. diff --git a/src/imail/README b/src/imail/README new file mode 100644 index 000000000..d87b282f1 --- /dev/null +++ b/src/imail/README @@ -0,0 +1,30 @@ +The IMAIL option. + +This option extends Edwin with an IMAP email reader. After loading +this option, an Edwin command named `imail' should be available. + +For more information see the accompanying user / reference manual. + + +Notes on the Edwin sources: + +If you want to add a new file to the source tree, you need to +modify the following three files: + + decls.scm + ed-ffi.scm + edwin.pkg + +If the file should be loaded into the default edwin band, you must also +edit the file: + + edwin.ldr + +If the file is to be autoloaded, you must edit the file: + + loadef.scm + +So, in either case, you have to change four files in +"/scheme/v8/src/edwin". Of course, you also have to put a copy of +your file in "/scheme/v8/src/edwin", too, and you have to put a link +to the new file in "/scheme/v7/linux/edwin". diff --git a/src/imail/autogen.sh b/src/imail/autogen.sh new file mode 100755 index 000000000..70bd51f82 --- /dev/null +++ b/src/imail/autogen.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +set -e +autoreconf --force --install diff --git a/src/imail/compile.scm b/src/imail/compile.scm index 8493bed7a..3fb0d6146 100644 --- a/src/imail/compile.scm +++ b/src/imail/compile.scm @@ -45,4 +45,4 @@ USA. "imail-util" "imap-response" "imap-syntax")) - (cref/generate-constructors "imail" 'all))) \ No newline at end of file + (cref/generate-constructors "imail"))) \ No newline at end of file diff --git a/src/imail/compile.sh b/src/imail/compile.sh new file mode 100755 index 000000000..c396df36b --- /dev/null +++ b/src/imail/compile.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# -*-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 +# 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 +# your option) any later version. +# +# MIT/GNU Scheme 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. +# +# You should have received a copy of the GNU General Public License +# along with MIT/GNU Scheme; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +# USA. + +# Compile the IMail option. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --batch-mode <<\EOF +(begin + + (parameterize ((param:suppress-loading-message? #t)) + (load-option 'EDWIN)) + + (load "compile.scm") + ) +EOF +suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` +report=imail-$suffix.crf +if [ -s "$report" ]; then + awk "{printf \"$report:%d: %s\\n\",NR,\$0}" $report +fi diff --git a/src/imail/configure.ac b/src/imail/configure.ac new file mode 100644 index 000000000..7ec4ebb83 --- /dev/null +++ b/src/imail/configure.ac @@ -0,0 +1,54 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_INIT([MIT/GNU Scheme Imail], + [1.22], + [bug-mit-scheme@gnu.org], + [mit-scheme-imail]) +AC_CONFIG_SRCDIR([imail.pkg]) + +AC_COPYRIGHT( +[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 + +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 +your option) any later version. + +MIT/GNU Scheme 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. + +You should have received a copy of the GNU General Public License +along with MIT/GNU Scheme; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA. +]) + +AM_INIT_AUTOMAKE + +AC_PROG_INSTALL + +MIT_SCHEME_PROJECT=mit-scheme +: ${MIT_SCHEME_EXE=mit-scheme} +MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` + +# Install plugin docs in Scheme's docdir subdirectories. +htmldir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/html' +pdfdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/pdf' + +AC_SUBST([MIT_SCHEME_PROJECT]) +AC_SUBST([MIT_SCHEME_EXE]) +AC_SUBST([MIT_SCHEME_LIBDIR]) +AC_SUBST([MIT_SCHEME_OS_SUFFIX]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/src/imail/imail.pkg b/src/imail/imail.pkg index 0778f8eb4..4178e8383 100644 --- a/src/imail/imail.pkg +++ b/src/imail/imail.pkg @@ -26,10 +26,10 @@ USA. ;;;; IMAIL mail reader: packaging -(global-definitions "../runtime/runtime") -(global-definitions "../sos/sos") -(global-definitions "../edwin/edwin") -(global-definitions "../star-parser/parser") +(global-definitions runtime/) +(global-definitions sos/) +(global-definitions edwin/) +(global-definitions star-parser/parser) (define-package (edwin imail) (files "imail-util" diff --git a/src/imail/install.sh b/src/imail/install.sh deleted file mode 100755 index 8926ad027..000000000 --- a/src/imail/install.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -cpx -c ~/new/imail $scm/. diff --git a/src/imail/load.scm b/src/imail/load.scm deleted file mode 100644 index 1bfaa4ec0..000000000 --- a/src/imail/load.scm +++ /dev/null @@ -1,36 +0,0 @@ -#| -*-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 - -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 -your option) any later version. - -MIT/GNU Scheme 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. - -You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; IMAIL mail reader: loader - -(load-option 'regular-expression) -(load-option 'sos) -(load-option 'wt-tree) -(with-loader-base-uri (system-library-uri "imail/") - (lambda () - (fluid-let ((*allow-package-redefinition?* #t)) - (load-package-set "imail")))) -(add-subsystem-identification! "IMAIL" '(1 21)) \ No newline at end of file diff --git a/src/imail/make.scm b/src/imail/make.scm new file mode 100644 index 000000000..604b24a37 --- /dev/null +++ b/src/imail/make.scm @@ -0,0 +1,36 @@ +#| -*-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 + Massachusetts Institute of Technology + +This file is part of the IMail option for MIT/GNU Scheme. + +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. + +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. + +You should have received a copy of the GNU General Public License +along with IMail; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +|# + +;;;; IMAIL mail reader: loader + +(load-option 'regular-expression) +(load-option 'wt-tree) +(load-option 'sos) +(load-option 'edwin) +(with-loader-base-uri (system-library-uri "imail/") + (lambda () + (fluid-let ((*allow-package-redefinition?* #t)) + (load-package-set "imail")))) +(add-subsystem-identification! "IMAIL" '(1 22)) \ No newline at end of file diff --git a/doc/imail/imail.texinfo b/src/imail/mit-scheme-imail.texi similarity index 99% rename from doc/imail/imail.texinfo rename to src/imail/mit-scheme-imail.texi index 48b75b759..840051790 100644 --- a/doc/imail/imail.texinfo +++ b/src/imail/mit-scheme-imail.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @comment %**start of header -@setfilename mit-scheme-imail +@setfilename mit-scheme-imail.info @set EDITION 1.9 @set VERSION 1.19 @set UPDATED 2011-10-14 diff --git a/src/runtime/command-line.scm b/src/runtime/command-line.scm index 289f1a387..66f60332b 100644 --- a/src/runtime/command-line.scm +++ b/src/runtime/command-line.scm @@ -273,6 +273,9 @@ ADDITIONAL OPTIONS supported by this band:\n") repl))))) "Evaluates the argument expressions as if in the REPL.") + (simple-command-line-parser "edit" edit + "Causes Edwin to start immediately after Scheme.") + (simple-command-line-parser "help" show-command-line-options #f) (simple-command-line-parser "version" (lambda () (exit)) #f) diff --git a/src/runtime/global.scm b/src/runtime/global.scm index dcaed238a..873cac585 100644 --- a/src/runtime/global.scm +++ b/src/runtime/global.scm @@ -143,6 +143,30 @@ USA. (call-with-truncated-output-string max (lambda (port) (write object port))))) + +(define (edit . args) + (let ((env (let ((package (name->package '(edwin)))) + (and package (package/environment package))))) + (if env + (apply (environment-lookup env 'edit) args) + (begin + (with-notification + (lambda (port) (display "Loading Edwin" port)) + (lambda () + (parameterize ((param:suppress-loading-message? #t)) + (load-option 'edwin) + (if (let ((display (get-environment-variable "DISPLAY"))) + (and (string? display) + (not (string-null? display)))) + (ignore-errors (lambda () (load-option 'x11-screen))))))) + (apply (environment-lookup (->environment '(edwin)) 'edit) args))))) + +(define edwin edit) + +(define (spawn-edwin . args) + (let ((thread (create-thread #f (lambda () (apply edwin args))))) + (detach-thread thread) + thread)) (define (pa procedure) (guarantee procedure? procedure 'pa) diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg index 39c2f806a..ef89e7aaa 100644 --- a/src/runtime/runtime.pkg +++ b/src/runtime/runtime.pkg @@ -528,6 +528,8 @@ USA. cell-contents cell? constant-procedure + edit + edwin emergency-exit ;R7RS environment-link-name ephemeron-broken? @@ -586,6 +588,7 @@ USA. primitive-procedure-arity primitive-procedure-documentation pwd + spawn-edwin suspend (reference-barrier identity-procedure) remove-hook-from-list diff --git a/tests/runtime/test-syncproc.scm b/tests/runtime/test-syncproc.scm index fe55b11b8..091b27688 100644 --- a/tests/runtime/test-syncproc.scm +++ b/tests/runtime/test-syncproc.scm @@ -28,6 +28,8 @@ USA. (declare (usual-integrations)) +(load-option 'synchronous-subprocess) + (define (shell command) (run-shell-command command 'INPUT #f 'OUTPUT #f)) -- 2.25.1