From c5d2e421ce4ec77c080f1d3efb9a44bcda7be4fc Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@googlemail.com>
Date: Mon, 25 Feb 2013 18:51:20 +0000
Subject: [PATCH 1/2] Moved packages to lib directory.

---
 compiler/nimrod.cfg                              | 2 +-
 {packages => lib/packages}/docutils/highlite.nim | 0
 {packages => lib/packages}/docutils/rst.nim      | 0
 {packages => lib/packages}/docutils/rstast.nim   | 0
 {packages => lib/packages}/docutils/rstgen.nim   | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename {packages => lib/packages}/docutils/highlite.nim (100%)
 rename {packages => lib/packages}/docutils/rst.nim (100%)
 rename {packages => lib/packages}/docutils/rstast.nim (100%)
 rename {packages => lib/packages}/docutils/rstgen.nim (100%)

diff --git a/compiler/nimrod.cfg b/compiler/nimrod.cfg
index aa49729b91..a0e59aa098 100755
--- a/compiler/nimrod.cfg
+++ b/compiler/nimrod.cfg
@@ -6,7 +6,7 @@ hint[XDeclaredButNotUsed]:off
 path:"llvm"
 path:"$projectPath/.."
 
-path:"$nimrod/packages/docutils"
+path:"$lib/packages/docutils"
 
 define:booting
 
diff --git a/packages/docutils/highlite.nim b/lib/packages/docutils/highlite.nim
similarity index 100%
rename from packages/docutils/highlite.nim
rename to lib/packages/docutils/highlite.nim
diff --git a/packages/docutils/rst.nim b/lib/packages/docutils/rst.nim
similarity index 100%
rename from packages/docutils/rst.nim
rename to lib/packages/docutils/rst.nim
diff --git a/packages/docutils/rstast.nim b/lib/packages/docutils/rstast.nim
similarity index 100%
rename from packages/docutils/rstast.nim
rename to lib/packages/docutils/rstast.nim
diff --git a/packages/docutils/rstgen.nim b/lib/packages/docutils/rstgen.nim
similarity index 100%
rename from packages/docutils/rstgen.nim
rename to lib/packages/docutils/rstgen.nim

From cc893b968b6204622727cf6f9362519752297a0e Mon Sep 17 00:00:00 2001
From: Simon Hafner <hafnersimon@gmail.com>
Date: Tue, 26 Feb 2013 14:36:33 -0600
Subject: [PATCH 2/2] added isServing parameter

---
 compiler/main.nim    | 1 +
 compiler/msgs.nim    | 4 ++--
 compiler/options.nim | 1 +
 compiler/service.nim | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/main.nim b/compiler/main.nim
index ce08eaa303..053783d9bc 100755
--- a/compiler/main.nim
+++ b/compiler/main.nim
@@ -559,6 +559,7 @@ proc MainCommand =
       wantMainModule()
       CommandSuggest()
   of "serve":
+    isServing = true
     gGlobalOptions.incl(optCaasEnabled)
     msgs.gErrorMax = high(int)  # do not stop after first error     
     serve(MainCommand)
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 0f2affc366..bec30388cc 100755
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -523,8 +523,8 @@ proc SuggestWriteln*(s: string) =
       stdoutSocket.send(s & "\c\L")
     
 proc SuggestQuit*() =
-  if isNil(stdoutSocket): quit(0)
-  else: 
+  if not isServing: quit(0)
+  elif not isNil(stdoutSocket):
     stdoutSocket.send("\c\L")
     raise newException(ESuggestDone, "suggest done")
   
diff --git a/compiler/options.nim b/compiler/options.nim
index e809c4e968..ad7c834dc3 100755
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -105,6 +105,7 @@ var
   gEvalExpr* = ""             # expression for idetools --eval
   gLastCmdTime*: float        # when caas is enabled, we measure each command
   gListFullPaths*: bool
+  isServing*: bool = false
   
 proc importantComments*(): bool {.inline.} = gCmd in {cmdDoc, cmdIdeTools}
 proc usesNativeGC*(): bool {.inline.} = gSelectedGC >= gcRefc
diff --git a/compiler/service.nim b/compiler/service.nim
index defdbceb72..eaf3693ce3 100644
--- a/compiler/service.nim
+++ b/compiler/service.nim
@@ -90,4 +90,3 @@ proc serve*(action: proc (){.nimcall.}) =
   else:
     echo "Invalid server.type:", typ
     quit 1
-