6 files changed, 25 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index f58ce1c087..0a3e47f8e9 100644
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -36,7 +36,7 @@ class StandardCompileClient {
     pathsList.map(absFileName).mkString("", sep, "")
   }
 
-  val fileEnding = ".scala"
+  val fileEnding = Properties.fileEndingString
 
   protected def normalize(args: Array[String]): (String, String) = {
     var i = 0
@@ -57,7 +57,7 @@ class StandardCompileClient {
       } else if (arg == "-shutdown") {
         shutdown = true
       }
-      i = i + 1
+      i += 1
       if (i < args.length) {
         if (arg == "-classpath" ||
             arg == "-sourcepath" ||
@@ -65,7 +65,7 @@ class StandardCompileClient {
             arg == "-extdirs" ||
             arg == "-d") {
           args(i) = absFileNames(args(i))
-          i = i + 1
+          i += 1
         } else if (arg == "-server") {
           serverAdr = args(i)
           args(i-1) = ""
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index 0907b589d3..333d95d6ca 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -20,7 +20,7 @@ class CompilerCommand(arguments: List[String], val settings: Settings,
   val cmdName = "scalac"
 
   /** The file extension of files that the compiler can process */
-  def fileEnding = ".scala" //todo: lazy val
+  def fileEnding = Properties.fileEndingString //todo: lazy val
 
   private val helpSyntaxColumnWidth: Int =
     Iterable.max(settings.allSettings map (_.helpSyntax.length))
diff --git a/src/compiler/scala/tools/nsc/EvalLoop.scala b/src/compiler/scala/tools/nsc/EvalLoop.scala
index 25f34e4e8d..ea58f8b9b0 100644
--- a/src/compiler/scala/tools/nsc/EvalLoop.scala
+++ b/src/compiler/scala/tools/nsc/EvalLoop.scala
@@ -1,5 +1,5 @@
 /* NSC -- new Scala compiler
- * Copyright 2005-2006 LAMP/EPFL
+ * Copyright 2005-2007 LAMP/EPFL
  * @author  Martin Odersky
  */
 // $Id$
@@ -10,7 +10,7 @@ trait EvalLoop {
 
   def prompt: String
 
-  def loop(action: (String) => Unit): Unit = {
+  def loop(action: (String) => Unit) {
     Console.print(prompt)
     val line = Console.readLine
     if ((line ne null) && line.length() > 0) {
diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
index 004ea3f74a..99a26e1336 100644
--- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala
+++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
@@ -104,7 +104,7 @@ class InterpreterLoop(in0: BufferedReader, out: PrintWriter) {
   }
 
   /** Prompt to print when awaiting input */
-  val prompt = "scala> "
+  val prompt = Properties.shellPromptString
 
   /** The main read-eval-print loop for the interpreter.  It calls
    *  <code>command()</code> for each line of input, and stops when
@@ -114,7 +114,6 @@ class InterpreterLoop(in0: BufferedReader, out: PrintWriter) {
     var first = true
     while (true) {
       if (interactive) {
-        out.print("\n")
 	out.print(prompt)
         out.flush
       }
diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala
index cc50e71d9b..e473a83a60 100644
--- a/src/compiler/scala/tools/nsc/Main.scala
+++ b/src/compiler/scala/tools/nsc/Main.scala
@@ -21,7 +21,8 @@ object Main extends AnyRef with EvalLoop {
   val versionMsg = "Scala compiler " +
     Properties.versionString + " -- " +
     Properties.copyrightString
-  val prompt = "\nnsc> "
+
+  val prompt = Properties.residentPromptString
 
   var reporter: ConsoleReporter = _
 
diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala
index 9f3001c9e0..d6fdca15bb 100644
--- a/src/compiler/scala/tools/nsc/Properties.scala
+++ b/src/compiler/scala/tools/nsc/Properties.scala
@@ -31,7 +31,7 @@ object Properties {
     */
   val versionString: String = {
     val defaultString = "(unknown)"
-    "version " + props.getProperty("version.number")
+    "version " + props.getProperty("version.number", defaultString)
   }
 
   val copyrightString: String = {
@@ -44,6 +44,21 @@ object Properties {
     props.getProperty("file.encoding", defaultString)
   }
 
+  val fileEndingString: String = {
+    val defaultString = ".scala"
+    props.getProperty("file.ending", defaultString)
+  }
+
+  val residentPromptString: String = {
+    val defaultString = "\nnsc> "
+    props.getProperty("resident.prompt", defaultString)
+  }
+
+  val shellPromptString: String = {
+    val defaultString = "\nscala> "
+    props.getProperty("shell.prompt", defaultString)
+  }
+
   val scalaHome: String =
     System.getProperty("scala.home")