Merge pull request scala#4660 from som-snytt/issue/9270

SethTisue · SethTisue · commit d5f5b26e6fcf · 2015-08-06T15:24:59.000-07:00
SI-9270 Default xml coalescing off in 2.12
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ trait ScalaSettings extends AbsScalaSettings`
`140`	`140`	`// XML parsing options`
`141`	`141`	`object XxmlSettings extends MultiChoiceEnumeration {`
`142`	`142`	`val coalescing = Choice("coalescing", "Convert PCData to Text and coalesce sibling nodes")`
`143`		`- def isCoalescing = (Xxml contains coalescing) \|\| (!isScala212 && !Xxml.isSetByUser)`
	`143`	`+ def isCoalescing = Xxml contains coalescing`
`144`	`144`	`}`
`145`	`145`	`val Xxml = MultiChoiceSetting(`
`146`	`146`	`name = "-Xxml",`