diff options
| author | Seth Tisue <seth@tisue.net> | 2015-08-06 15:24:59 -0700 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-08-06 15:24:59 -0700 |
| commit | d5f5b26e6fcf69df7b6ceb3e72e7fa15af8538a8 (patch) | |
| tree | 04cbad527b9f92ddd45b24f3591a2db0bccafa38 | |
| parent | 15df28ffe1ff45ac3b91792093bf178c09899c8f (diff) | |
| parent | be9450b2cffe3b1ee723fc7e2f5df83644b35a66 (diff) | |
| download | scala-d5f5b26e6fcf69df7b6ceb3e72e7fa15af8538a8.tar.gz scala-d5f5b26e6fcf69df7b6ceb3e72e7fa15af8538a8.tar.bz2 scala-d5f5b26e6fcf69df7b6ceb3e72e7fa15af8538a8.zip | |
Merge pull request #4660 from som-snytt/issue/9270
SI-9270 Default xml coalescing off in 2.12
| -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", |