diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-22 11:27:36 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-22 11:27:36 -0700 |
commit | 1fbce4612c21a4d0c553ea489b4765494828c09f (patch) | |
tree | 814f29af68d6b78b6cafcaed7e1841c9c54dc928 /src/compiler/scala/tools/nsc/Properties.scala | |
parent | c3b6cfaaadc0426c79fbfc8f42d592ecd9ebe43d (diff) | |
parent | 7968421bd6515eeb88fb420bae3ff3bc23e5876d (diff) | |
download | scala-2.11.7.tar.gz scala-2.11.7.tar.bz2 scala-2.11.7.zip |
Merge pull request #4564 from som-snytt/issue/promptv2.11.7
SI-9206 Fix REPL code indentation
Diffstat (limited to 'src/compiler/scala/tools/nsc/Properties.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/Properties.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index 9f160e2485..ca7d8776d4 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -13,7 +13,7 @@ object Properties extends scala.util.PropertiesTrait { // settings based on jar properties, falling back to System prefixed by "scala." def residentPromptString = scalaPropOrElse("resident.prompt", "\nnsc> ") - def shellPromptString = scalaPropOrElse("shell.prompt", "\nscala> ") + def shellPromptString = scalaPropOrElse("shell.prompt", "%nscala> ") // message to display at EOF (which by default ends with // a newline so as not to break the user's terminal) def shellInterruptedString = scalaPropOrElse("shell.interrupted", f":quit$lineSeparator") |