diff options
| -rw-r--r-- | build.sbt | 4 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 5 |
2 files changed, 5 insertions, 4 deletions
@@ -700,9 +700,7 @@ lazy val root = (project in file(".")) scaladoc, scalap, partestExtras, junit, libraryAll, scalaDist).settings( sources in Compile := Seq.empty, onLoadMessage := """|*** Welcome to the sbt build definition for Scala! *** - |This build definition has an EXPERIMENTAL status. If you are not - |interested in testing or working on the build itself, please use - |the Ant build definition for now. Check README.md for more information.""".stripMargin + |Check README.md for more information.""".stripMargin ) // The following subprojects' binaries are required for building "pack": diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index 66a5f08e96..ea6ab6aad5 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -966,7 +966,10 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) // while we go fire up the REPL try { - createInterpreter() + // don't allow ancient sbt to hijack the reader + savingReader { + createInterpreter() + } intp.initializeSynchronous() globalFuture = Future successful true if (intp.reporter.hasErrors) { |