Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Fri, 13 Dec 2019 04:40:26 +0000 (21:40 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Fri, 13 Dec 2019 04:40:26 +0000 (21:40 -0700)
13 files changed:
1  2 
doc/make-common.in
doc/ref-manual/Makefile.in
doc/ref-manual/scheme.texinfo
src/Makefile.in
src/Setup.sh
src/configure.ac
src/microcode/configure.ac
src/microcode/debug.c
src/microcode/makegen/Makefile.in.in
src/microcode/mit_scheme_native_code.m4
src/runtime/mit-macros.scm
src/runtime/runtime.pkg
tests/check.scm

Simple merge
Simple merge
index 22bde80838bf9eb57325c235958ba750193a4a9a,159142b777d4d01a07bf6e48dbe9ea0ffe22d60c..bffa223fb49b0bfcaf34e56bb13988130075d821
@@@ -110,11 -108,21 +110,21 @@@ Documentation License.'
      \hfill%
    }%
  }
+ % Explicit hyphen that doesn't block automatic hyphenation, in words
+ % like `log-probability'.
+ \gdef\hy{-\penalty0\hskip0pt\relax}
  @end tex
  
+ @ifnottex
+ @macro hy {n}
+ \n\
+ @end macro
+ @end ifnottex
  @ifnottex
  @node Top, Acknowledgements, (dir), (dir)
 -@top MIT/GNU Scheme
 +@top MIT/GNU Scheme Pucked Reference Manual
  
  @insertcopying
  @end ifnottex
diff --cc src/Makefile.in
Simple merge
diff --cc src/Setup.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/check.scm
index c5ec1832322e026cf9ca99dc51ee826867709219,e6ba132b19c993b1c48918f587f2b1579ae4320f..a2490c4c01704bcb8827cea7ee9e487ba1cfe1a1
@@@ -42,9 -42,10 +42,10 @@@ USA
    '(
      ("compiler/test-fasdump" (compiler portable-fasdump))
      "compiler/test-fgopt-conect"
+     "compiler/test-open-code"
      "compiler/test-toplev"
      "compiler/test-varname"
 -    "compiler/test-vartrap"
 +    ;;"compiler/test-vartrap"
      "compiler/test-y"
      "microcode/test-chacha"
      ;++ Kludge to run the flonum cast tests interpreted and compiled --