Index: generic/nsfAPI.h
===================================================================
diff -u -r143ac569e197689119f0e355bfa4a7fd7e4ee8fb -re3487a745ff8d03bff82959c8fb0852e9ae23b36
--- generic/nsfAPI.h	(.../nsfAPI.h)	(revision 143ac569e197689119f0e355bfa4a7fd7e4ee8fb)
+++ generic/nsfAPI.h	(.../nsfAPI.h)	(revision e3487a745ff8d03bff82959c8fb0852e9ae23b36)
@@ -362,7 +362,7 @@
 static int NsfVarExistsCmd(Tcl_Interp *interp, int withArray, NsfObject *object, CONST char *varName);
 static int NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int nobjc, Tcl_Obj *CONST nobjv[]);
 static int NsfVarSetCmd(Tcl_Interp *interp, int withArray, NsfObject *object, Tcl_Obj *varName, Tcl_Obj *value);
-static int NsfVarUnsetCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varName);
+static int NsfVarUnsetCmd(Tcl_Interp *interp, int withNocomplain, NsfObject *object, Tcl_Obj *varName);
 static int NsfOAutonameMethod(Tcl_Interp *interp, NsfObject *obj, int withInstance, int withReset, Tcl_Obj *name);
 static int NsfOClassMethod(Tcl_Interp *interp, NsfObject *obj, Tcl_Obj *class);
 static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *obj);
@@ -1669,11 +1669,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    NsfObject *object = (NsfObject *)pc.clientData[0];
-    Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[1];
+    int withNocomplain = (int )PTR2INT(pc.clientData[0]);
+    NsfObject *object = (NsfObject *)pc.clientData[1];
+    Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[2];
 
     assert(pc.status == 0);
-    return NsfVarUnsetCmd(interp, object, varName);
+    return NsfVarUnsetCmd(interp, withNocomplain, object, varName);
 
   }
 }
@@ -2577,7 +2578,8 @@
   {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"value", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::var::unset", NsfVarUnsetCmdStub, 2, {
+{"::nsf::var::unset", NsfVarUnsetCmdStub, 3, {
+  {"-nocomplain", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL},
   {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },