From 766bcd608ed40c3c0f67dc5a1dec66fc40505529 Mon Sep 17 00:00:00 2001
From: extempore <extempore@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date: Mon, 21 Sep 2009 17:11:51 +0000
Subject: [PATCH] Changed vt-warning workaround to enable the setting in the
 doc settings object, so anything using it will get the fix.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@18725 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
---
 build.xml                                       | 2 --
 src/compiler/scala/tools/nsc/doc/Settings.scala | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index b81d01eaf..15912cfa9 100644
--- a/build.xml
+++ b/build.xml
@@ -1148,7 +1148,6 @@ DOCUMENTATION
     <stopwatch name="docs.lib.timer"/>
     <mkdir dir="${build-docs.dir}/library"/>
     <scaladoc
-	  addParams="-Ysuppress-vt-typer-warnings"
       destdir="${build-docs.dir}/library"
       windowtitle="Scala Library"
       doctitle="Scala ${version.number} API"
@@ -1232,7 +1231,6 @@ DOCUMENTATION
     <stopwatch name="docs.comp.timer"/>
     <mkdir dir="${build-docs.dir}/compiler"/>
     <scaladoc
-	  addParams="-Ysuppress-vt-typer-warnings"
       destdir="${build-docs.dir}/compiler"
       windowtitle="Scala Compiler"
       doctitle="Scala Compiler ${version.number} API"
diff --git a/src/compiler/scala/tools/nsc/doc/Settings.scala b/src/compiler/scala/tools/nsc/doc/Settings.scala
index 9861c159f..8a0d61fe3 100644
--- a/src/compiler/scala/tools/nsc/doc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/doc/Settings.scala
@@ -24,4 +24,7 @@ class Settings(error: String => Unit) extends scala.tools.nsc.Settings(error) {
   val stylesheetfile = StringSetting    ("-stylesheetfile", "stylesheetfile", "File to change style of the generated documentation", "style.css")
   val pagetop        = StringSetting    ("-top", "pagetop", "Include top text for each page", "")
   val windowtitle    = StringSetting    ("-windowtitle", "windowtitle", "Specify window title of generated HTML documentation", "Scala 2")
+  
+  // working around issue described in r18708.
+  suppressVTWarn.value = true
 }