diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-11-07 09:07:43 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-11-07 09:07:43 +0100 |
| commit | f7c3c6bc37228a70e06d5542ed4927bf3614486f (patch) | |
| tree | 5b023cb22f6fb3048e26de1dfadc8c4fcca51d21 /src/compiler | |
| parent | 838ff2c2f256d1c114a406ff1032be92a3d3dac6 (diff) | |
| parent | 126effe46005673ca826045e9cb037096d68af90 (diff) | |
| download | scala-f7c3c6bc37228a70e06d5542ed4927bf3614486f.tar.gz scala-f7c3c6bc37228a70e06d5542ed4927bf3614486f.tar.bz2 scala-f7c3c6bc37228a70e06d5542ed4927bf3614486f.zip | |
Merge pull request #4058 from som-snytt/issue/verbose-load
SI-8922 REPL load -v
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Properties.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index bec686ec05..9f160e2485 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -14,7 +14,9 @@ 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 shellInterruptedString = scalaPropOrElse("shell.interrupted", ":quit\n") + // 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") // derived values def isEmacsShell = propOrEmpty("env.emacs") != "" |