Merge branch 'master' into Gtk

diff --cc doc/Makefile.in
Simple merge

diff --cc doc/configure.ac
Simple merge

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

diff --cc src/Makefile.in
Simple merge

diff --cc src/Setup.sh
Simple merge

diff --cc src/configure.ac
index 57ade1fc616eda49f5bdfc6d6118f15920ee58be,27bdea69f1afbba7c8207ed3ec58747406dd7e21..eb830d5500b4ed6465a30825074ce9098672f8ce
--- 1/src/configure.ac
--- 2/src/configure.ac
+++ b/src/configure.ac
@@@ -64,17 -64,6 +64,12 @@@ els
  fi
  DEFAULT_TARGET=${with_default_target}
  
- AC_ARG_WITH([default-target],
-     AS_HELP_STRING([--with-default-target],
-       [Set the default make target [[all]]]))
- DEFAULT_TARGET=${with_default_target=all}
- 
 +AC_ARG_WITH([gtk],
 +    [AS_HELP_STRING([--with-gtk],
 +      [Support the GNOME Toolkits [[auto]]])],
 +    [],
 +    [with_gtk=auto])
 +
  AC_CANONICAL_HOST
  
  MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])

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

diff --cc src/etc/create-makefiles.sh
Simple merge

diff --cc src/etc/make-liarc.sh
Simple merge

diff --cc src/etc/optiondb.scm
Simple merge

diff --cc src/microcode/cmpauxmd/i386.m4
Simple merge

diff --cc src/microcode/cmpauxmd/x86-64.m4
Simple merge

diff --cc src/microcode/cmpintmd/x86-64.c
Simple merge

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

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

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

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

diff --cc src/microcode/osctty.h
Simple merge

diff --cc src/microcode/osio.h
Simple merge

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

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

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

diff --cc src/microcode/pruxffi.h
Simple merge

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

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

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

diff --cc src/microcode/uxsig.h
Simple merge

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

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

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

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

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

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

diff --cc tests/check.scm
Simple merge

diff --cc tests/runtime/test-char-set.scm
index 3bcd57f9e579f0e8fd912842a13abd81471ae9c5,a991cdf5713245b40edc8aee9e5ac7ba95b254ea..c9b25dcd1d4c22760c12ce3c9239949dccb25069
--- 1/tests/runtime/test-char-set.scm
--- 2/tests/runtime/test-char-set.scm
+++ b/tests/runtime/test-char-set.scm
@@@ -374,14 -374,7 +374,14 @@@ USA
    (n+1-generator 2-generator))
  
  (define interesting-svls
 -  (cons (list)
 -      (append! (1-generator interesting-points)
 -               (2-generator interesting-points)
 -               (3-generator interesting-points))))
 +  (if (let ((v (get-environment-variable "FAST")))
 +      (or (eq? v #f) (string-null? v)))
 +      (begin
 +      (warn "To avoid long runtimes, export FAST=y.")
 +      (cons (list)
 +            (append! (1-generator interesting-points)
 +                     (2-generator interesting-points)
 +                     (3-generator interesting-points))))
 +      (begin
 +      (cons (list)
-             (1-generator interesting-points)))))
++            (1-generator interesting-points)))))

diff --cc tests/runtime/test-hash-table.scm
Simple merge