Minor fix for Choice setting plus added some de...

Minor fix for Choice setting plus added some deprecated methods that
should survive till next release. review by extempore

3 files changed, 9 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index 3be18bbb08..4c6e14ed6f 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -48,6 +48,11 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
   @deprecated("Use `intp` instead.")
   def interpreter = intp
 
+  @deprecated("Use `intp` instead.")
+  def interpreter_= (i: Interpreter){
+    intp = i
+  }
+
   /** The context class loader at the time this object was created */
   protected val originalClassLoader = Thread.currentThread.getContextClassLoader
 
@@ -687,4 +692,4 @@ object ILoop {
     Console.println("\nDebug repl exiting.")
     repl.closeInterpreter()
   }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
index 1ee04a4090..3f466780e9 100644
--- a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
@@ -41,5 +41,7 @@ object InteractiveReader {
     }
 
   def apply(): InteractiveReader = SimpleReader()
+  @deprecated("Use `apply` instead.")
+  def createDefault(): InteractiveReader = apply()
 }
 
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
index cfaef4acaf..3a6c1ccaa7 100644
--- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
@@ -550,6 +550,7 @@ class MutableSettings(val errorFn: String => Unit) extends AbsSettings with Scal
     }
     def unparse: List[String] =
       if (value == default) Nil else List(name + ":" + value)
+    override def tryToSetFromPropertyValue(s: String) = tryToSetColon(s::Nil)
 
     withHelpSyntax(name + ":<" + helpArg + ">")
   }