summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2006-03-27 16:23:51 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2006-03-27 16:23:51 +0000
commit20978ce7ae2c5db051cea483f2247c30f0e816ec (patch)
treea7436bcc6f757249b318ad81710138ce174b9b2b
parent95921f1ad9d7d72136c8336fb13343f1a9c83352 (diff)
downloadscala-20978ce7ae2c5db051cea483f2247c30f0e816ec.tar.gz
scala-20978ce7ae2c5db051cea483f2247c30f0e816ec.tar.bz2
scala-20978ce7ae2c5db051cea483f2247c30f0e816ec.zip
Scalac now uses the default character encoding ...
Scalac now uses the default character encoding when -encoding is not set. Fixed bug #525.
-rw-r--r--src/compiler/scala/tools/nsc/Settings.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala
index 780f33cdc9..78592e7e9f 100644
--- a/src/compiler/scala/tools/nsc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/Settings.scala
@@ -69,7 +69,8 @@ class Settings(error: String => unit) {
val bootclasspath = StringSetting ("-bootclasspath", "path", "Override location of bootstrap class files", bootclasspathDefault)
val extdirs = StringSetting ("-extdirs", "dirs", "Override location of installed extensions", extdirsDefault)
val outdir = StringSetting ("-d", "directory", "Specify where to place generated class files", ".")
- val encoding = StringSetting ("-encoding", "encoding", "Specify character encoding used by source files", "ISO-8859-1")
+ val encoding = StringSetting ("-encoding", "encoding", "Specify character encoding used by source files",
+ java.nio.charset.Charset.defaultCharset.name)
val target = ChoiceSetting ("-target", "Specify which backend to use", List("jvm", "msil"), "jvm")
val migrate = BooleanSetting("-migrate", "Assist in migrating from Scala version 1.0")
val debug = BooleanSetting("-debug", "Output debugging messages")