# HG changeset patch
# User wenzelm
# Date 1337888771 -7200
# Node ID 7700f0e9618c4a567874b2c690fea12c4043383c
# Parent  3eb598b044ade1aa8a6389e6a69f08abd3a9f21a
avoid scala.tools.nsc.Interpreter -- deprecated in scala-2.9.0;
discontinued support for scala-2.8.x;

diff -r 3eb598b044ad -r 7700f0e9618c src/Tools/jEdit/README_BUILD
--- a/src/Tools/jEdit/README_BUILD	Thu May 24 18:21:54 2012 +0200
+++ b/src/Tools/jEdit/README_BUILD	Thu May 24 21:46:11 2012 +0200
@@ -6,7 +6,7 @@
 
   (experimental support for JDK/OpenJDK 1.7, but not OpenJDK 1.6)
 
-* Scala 2.9.2 (or 2.8.2.final)
+* Scala 2.9.2
   http://www.scala-lang.org
 
   (experimental support for Scala 2.10.x milestones)
diff -r 3eb598b044ad -r 7700f0e9618c src/Tools/jEdit/src/scala_console.scala
--- a/src/Tools/jEdit/src/scala_console.scala	Thu May 24 18:21:54 2012 +0200
+++ b/src/Tools/jEdit/src/scala_console.scala	Thu May 24 21:46:11 2012 +0200
@@ -17,7 +17,8 @@
 import java.lang.System
 import java.io.{File, OutputStream, Writer, PrintWriter}
 
-import scala.tools.nsc.{Interpreter, GenericRunnerSettings, NewLinePrintWriter, ConsoleWriter}
+import scala.tools.nsc.{GenericRunnerSettings, NewLinePrintWriter, ConsoleWriter}
+import scala.tools.nsc.interpreter.IMain
 import scala.collection.mutable
 
 
@@ -39,7 +40,7 @@
 
   /* global state -- owned by Swing thread */
 
-  private var interpreters = Map[Console, Interpreter]()
+  private var interpreters = Map[Console, IMain]()
 
   private var global_console: Console = null
   private var global_out: Output = null
@@ -103,7 +104,7 @@
     val settings = new GenericRunnerSettings(report_error)
     settings.classpath.value = reconstruct_classpath()
 
-    val interp = new Interpreter(settings, new PrintWriter(console_writer, true))
+    val interp = new IMain(settings, new PrintWriter(console_writer, true))
     {
       override def parentClassLoader = new JARClassLoader
     }