diff options
author | Paul Phillips <paulp@improving.org> | 2009-06-24 20:54:18 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-06-24 20:54:18 +0000 |
commit | 24781591253de7a9f54a3fc7bcf6ae4b3e969098 (patch) | |
tree | f9b63c0fd117c2da79c378cbb8eda2869274d326 /src/compiler/scala/tools/nsc/Global.scala | |
parent | f537546d8b32d06e9d9a921a47bb75f1b1f7ecfa (diff) | |
download | scala-24781591253de7a9f54a3fc7bcf6ae4b3e969098.tar.gz scala-24781591253de7a9f54a3fc7bcf6ae4b3e969098.tar.bz2 scala-24781591253de7a9f54a3fc7bcf6ae4b3e969098.zip |
Skeletal implementation of scala.io.File.
Separated default source code encoding (the one specified by -encoding)
from default system encoding, because otherwise you can't compile scala
with the defaults on OSX.
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 76507271c0..2f28468f3c 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -191,7 +191,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable private val reader: SourceReader = { def stdCharset: Charset = { - settings.encoding.value = Properties.encodingString // A mandatory charset + settings.encoding.value = Properties.sourceEncoding // A mandatory charset Charset.forName(settings.encoding.value) } val charset = |