From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 13 Dec 2019 04:40:26 +0000 (-0700)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-10.1.20~11
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=6472319b8ee4ae98bd311136e3341d98d371dfc0;p=mit-scheme.git

Merge branch 'master' into pucked.
---

6472319b8ee4ae98bd311136e3341d98d371dfc0
diff --cc doc/ref-manual/scheme.texinfo
index 22bde8083,159142b77..bffa223fb
--- a/doc/ref-manual/scheme.texinfo
+++ b/doc/ref-manual/scheme.texinfo
@@@ -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 tests/check.scm
index c5ec18323,e6ba132b1..a2490c4c0
--- a/tests/check.scm
+++ b/tests/check.scm
@@@ -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 --