Merged revisions 25817 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r25817 | dragos | 2011-10-11 11:58:13 +0200 (Tue, 11 Oct 2011) | 1 line

  Presentation compiler: let ShutdownReq propagate from the background
compiler, and don't mark a unit as crashed in that case. ........

Author: dragos

src/compiler/scala/tools/nsc/interactive/Global.scala

@@ -469,7 +469,8 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "")
           r set unit.body
         serviceParsedEntered()
       } catch {
-        case ex: FreshRunReq => throw ex // propagate a new run request
+        case ex: FreshRunReq => throw ex           // propagate a new run request
+        case ShutdownReq     => throw ShutdownReq  // propagate a shutdown request
 
         case ex =>
           println("[%s]: exception during background compile: ".format(unit.source) + ex)