fixes newly introduced bugs

4 files changed, 6 insertions, 11 deletions

diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim
index f32ff3c78..eca026e12 100644
--- a/compiler/ccgstmts.nim
+++ b/compiler/ccgstmts.nim
@@ -1,7 +1,7 @@
 #
 #
 #           The Nimrod Compiler
-#        (c) Copyright 2013 Andreas Rumpf
+#        (c) Copyright 2014 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
@@ -160,7 +160,6 @@ proc genSingleVar(p: BProc, a: PNode) =
   var v = a.sons[0].sym
   if sfCompileTime in v.flags: return
   var targetProc = p
-  var immediateAsgn = isAssignedImmediately(a.sons[2])
   if sfGlobal in v.flags:
     if sfPure in v.flags:
       # v.owner.kind != skModule:
@@ -180,14 +179,14 @@ proc genSingleVar(p: BProc, a: PNode) =
     registerGcRoot(p, v)
   else:
     assignLocalVar(p, v)
-    initLocalVar(p, v, immediateAsgn)
+    initLocalVar(p, v, isAssignedImmediately(a.sons[2]))
 
-  if immediateAsgn:
+  if a.sons[2].kind != nkEmpty:
     genLineDir(targetProc, a)
     loadInto(targetProc, a.sons[0], a.sons[2], v.loc)
 
 proc genClosureVar(p: BProc, a: PNode) =
-  var immediateAsgn = isAssignedImmediately(a.sons[2])
+  var immediateAsgn = a.sons[2].kind != nkEmpty
   if immediateAsgn:
     var v: TLoc
     initLocExpr(p, a.sons[0], v)
diff --git a/doc/lib.txt b/doc/lib.txt
index b5f8115b0..26ea1b735 100644
--- a/doc/lib.txt
+++ b/doc/lib.txt
@@ -450,10 +450,6 @@ Other
   This module contains code for reading from `stdin`:idx:. On UNIX the GNU
   readline library is wrapped and set up.
 
-* `zmq <zmq.html>`_
-  Nimrod 0mq wrapper. This file contains the low level C wrappers as well as
-  some higher level constructs.
-
 
 Wrappers
 ========
diff --git a/lib/system.nim b/lib/system.nim
index 8ab3ee2e5..3bf65c695 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -2185,7 +2185,7 @@ when not defined(JS): #and not defined(NimrodVM):
     proc initStackBottomWith(locals: pointer) {.inline, compilerproc.} =
       # We need to keep initStackBottom around for now to avoid
       # bootstrapping problems.
-      when defined(setStackBottom):
+      when declared(setStackBottom):
         setStackBottom(locals)
 
     var
diff --git a/web/nimrod.ini b/web/nimrod.ini
index 38a906ac5..327771850 100644
--- a/web/nimrod.ini
+++ b/web/nimrod.ini
@@ -54,7 +54,7 @@ srcdoc2: "pure/httpserver;pure/httpclient;pure/smtp;impure/ssl;pure/fsmonitor"
 srcdoc2: "pure/ropes;pure/unidecode/unidecode;pure/xmldom;pure/xmldomparser"
 srcdoc2: "pure/xmlparser;pure/htmlparser;pure/xmltree;pure/colors;pure/mimetypes"
 srcdoc2: "pure/json;pure/base64;pure/scgi;pure/redis;impure/graphics"
-srcdoc2: "impure/rdstdin;wrappers/zmq;wrappers/sphinx"
+srcdoc2: "impure/rdstdin;wrappers/sphinx"
 srcdoc2: "pure/collections/tables;pure/collections/sets;pure/collections/lists"
 srcdoc2: "pure/collections/intsets;pure/collections/queues;pure/encodings"
 srcdoc2: "pure/events;pure/collections/sequtils;pure/irc;pure/cookies"