fixed svn props, did some cleanup

5 files changed, 24 insertions, 3 deletions

diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 54111dceba..8a2729a3f9 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -114,8 +114,10 @@ object Predef extends LowPriorityImplicits {
   def implicitly[T](implicit e: T) = e    // for summoning implicit values from the nether world
   @inline def locally[T](x: T): T  = x    // to communicate intent and avoid unmoored statements
 
+  /*@XML*/
   // Apparently needed for the xml library
   val $scope = scala.xml.TopScope
+  /*XML@*/
 
   // Deprecated
 
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala
index 0c5d10b15e..1267e90c6d 100644
--- a/src/library/scala/package.scala
+++ b/src/library/scala/package.scala
@@ -75,10 +75,12 @@ package object scala {
   @deprecated("Use Thread.currentThread instead", "2.9.0")
   def currentThread = java.lang.Thread.currentThread()
 
+  /*@XML*/
   // Moved back into Predef to avoid unnecessary indirection by
   // way of the scala package object within the standard library,
   // but bridged for compatibility.
   @bridge def $scope = scala.xml.TopScope
+  /*XML@*/
 
   // Numeric types which were moved into scala.math.*
 
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index 9162ae0fc0..3c7aff5b60 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -8,13 +8,15 @@
 
 package scala.runtime
 
-import scala.reflect.ClassManifest
 import scala.collection.{ Seq, IndexedSeq, TraversableView }
 import scala.collection.mutable.WrappedArray
 import scala.collection.immutable.{ StringLike, NumericRange, List, Stream, Nil, :: }
 import scala.collection.generic.{ Sorted }
-import scala.xml.{ Node, MetaData }
 import scala.util.control.ControlThrowable
+/*@XML*/
+import scala.xml.{ Node, MetaData }
+/*XML@*/
+
 import java.lang.Double.doubleToLongBits
 import java.lang.reflect.{ Modifier, Method => JMethod }
 
@@ -278,8 +280,10 @@ object ScalaRunTime {
 
     // When doing our own iteration is dangerous
     def useOwnToString(x: Any) = x match {
+      /*@XML*/
       // Node extends NodeSeq extends Seq[Node] and MetaData extends Iterable[MetaData]
       case _: Node | _: MetaData => true
+      /*XML@*/
       // Range/NumericRange have a custom toString to avoid walking a gazillion elements
       case _: Range | _: NumericRange[_] => true
       // Sorted collections to the wrong thing (for us) on iteration - ticket #3493
@@ -334,6 +338,7 @@ object ScalaRunTime {
       case _: StackOverflowError | _: UnsupportedOperationException | _: AssertionError => "" + arg
     }
   }
+
   /** stringOf formatted for use in a repl result. */
   def replStringOf(arg: Any, maxElements: Int): String = {
     val s  = stringOf(arg, maxElements)
diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala
index db10ff9c1d..ff02b38fd3 100644
--- a/src/library/scala/sys/process/Process.scala
+++ b/src/library/scala/sys/process/Process.scala
@@ -132,7 +132,9 @@ trait ProcessCreation {
     * apply(<x> {dxPath.absolutePath} --dex --output={classesDexPath.absolutePath} {classesMinJarPath.absolutePath}</x>)
     * }}}
     */
+  /*@XML*/
   def apply(command: scala.xml.Elem): ProcessBuilder  = apply(command.text.trim)
+  /*XML@*/
 
   /** Create a [[scala.sys.process.ProcessBuilder]] from a `Boolean`. This can be
     * to force an exit value.
@@ -205,7 +207,9 @@ trait ProcessImplicits {
   implicit def urlToProcess(url: URL): URLBuilder                         = apply(url)
 
   /** Implicitly convert a [[scala.xml.Elem]] into a [[scala.sys.process.ProcessBuilder]] */
+  /*@XML*/
   implicit def xmlToProcess(command: scala.xml.Elem): ProcessBuilder      = apply(command)
+  /*XML@*/
 
   /** Implicitly convert a `String` into a [[scala.sys.process.ProcessBuilder]] */
   implicit def stringToProcess(command: String): ProcessBuilder           = apply(command)
diff --git a/src/library/scala/xml/package.scala b/src/library/scala/xml/package.scala
index dec05abd2a..901334ba58 100644
--- a/src/library/scala/xml/package.scala
+++ b/src/library/scala/xml/package.scala
@@ -1,3 +1,11 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2011, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
 package scala
 
 package object xml {
@@ -8,4 +16,4 @@ package object xml {
   type EntityResolver     = org.xml.sax.EntityResolver
   type InputSource        = org.xml.sax.InputSource
   type SAXParser          = javax.xml.parsers.SAXParser
-}
\ No newline at end of file
+}