- Many fixes to the new scriptcontext to make it work

sicshipadaba.c

@@ -31,6 +31,7 @@
 #include "statusfile.h"
 #include <splitter.h>
 #include "sicsobj.h"
+#include <macro.h>
 
 #define MAX_HDB_PATH 1024
 
@@ -691,8 +692,14 @@ static hdbCallbackReturn SICSScriptReadCallback(pHdb node, void *userData,
     /*
      * evaluate 
      */
+    if(pCon != NULL){
+    	MacroPush(pCon);
+    }
     status = Tcl_Eval(InterpGetTcl(pServ->pSics),command);
-    if(status != TCL_OK){
+    if(pCon != NULL){
+    	MacroPop();
+    }
+   if(status != TCL_OK){
         snprintf(error,1023,"ERROR: Tcl returned error: %s", 
             Tcl_GetStringResult(InterpGetTcl(pServ->pSics)));
         if(pCon != NULL){