diff options
| author | Burak Emir <emir@epfl.ch> | 2006-09-22 15:44:47 +0000 |
|---|---|---|
| committer | Burak Emir <emir@epfl.ch> | 2006-09-22 15:44:47 +0000 |
| commit | e3efde8ea0a9e5d884bf20f6d3390565478e5767 (patch) | |
| tree | 278dd45c9542e91aea0a1afecf5025a944e11de9 /src/compiler | |
| parent | 8ee34d403608e6e414e03e192c69d8256a1218d7 (diff) | |
| download | scala-e3efde8ea0a9e5d884bf20f6d3390565478e5767.tar.gz scala-e3efde8ea0a9e5d884bf20f6d3390565478e5767.tar.bz2 scala-e3efde8ea0a9e5d884bf20f6d3390565478e5767.zip | |
revert for 1.4 compatibility
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 21798d1e8a..acde99d24f 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -67,9 +67,9 @@ class Settings(error: String => unit) { } private val encodingDefault = - java.nio.charset.Charset.defaultCharset.name() - //new java.io.OutputStreamWriter( - // new java.io.ByteArrayOutputStream()).getEncoding + //java.nio.charset.Charset.defaultCharset.name() // bq: this exists only in Java1.5 :-( + new java.io.OutputStreamWriter( + new java.io.ByteArrayOutputStream()).getEncoding private val windowtitleDefault = "Scala Library Documentation" private val documenttitleDefault = "Scala 2" |