diff options
| author | Som Snytt <som.snytt@gmail.com> | 2015-07-25 23:33:12 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2015-07-25 23:33:12 -0700 |
| commit | be9450b2cffe3b1ee723fc7e2f5df83644b35a66 (patch) | |
| tree | c7f6b5d0411342de445ca8a0bdcfdb96da457e6b /src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | |
| parent | d7cf43f6933f6cdcca253ae5792ad9325da35ecf (diff) | |
| download | scala-be9450b2cffe3b1ee723fc7e2f5df83644b35a66.tar.gz scala-be9450b2cffe3b1ee723fc7e2f5df83644b35a66.tar.bz2 scala-be9450b2cffe3b1ee723fc7e2f5df83644b35a66.zip | |
SI-9270 Default xml coalescing off in 2.12
By default, `-Xxml:-coalescing` as of 2.12.
This commit corrects the default for future versions.
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index f15bd3c31c..3422167d02 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -140,7 +140,7 @@ trait ScalaSettings extends AbsScalaSettings // XML parsing options object XxmlSettings extends MultiChoiceEnumeration { val coalescing = Choice("coalescing", "Convert PCData to Text and coalesce sibling nodes") - def isCoalescing = (Xxml contains coalescing) || (!isScala212 && !Xxml.isSetByUser) + def isCoalescing = Xxml contains coalescing } val Xxml = MultiChoiceSetting( name = "-Xxml", |