Index: generic/nsfAPI.h
===================================================================
diff -u -rf67408d8e6f8ba9bdd6e4ec3c54dfa3a23576161 -r3e18b80be2883ba647c2110a2e8e2b1980940c30
--- generic/nsfAPI.h	(.../nsfAPI.h)	(revision f67408d8e6f8ba9bdd6e4ec3c54dfa3a23576161)
+++ generic/nsfAPI.h	(.../nsfAPI.h)	(revision 3e18b80be2883ba647c2110a2e8e2b1980940c30)
@@ -345,11 +345,11 @@
 static int NsfMethodPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodName, int methodproperty, Tcl_Obj *value);
 static int NsfMethodRegisteredCmd(Tcl_Interp *interp, Tcl_Obj *handle);
 static int NsfMethodSetterCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *parameter);
-static int NsfMyCmd(Tcl_Interp *interp, int withLocal, int withSystem, Tcl_Obj *methodName, int nobjc, Tcl_Obj *CONST nobjv[]);
+static int NsfMyCmd(Tcl_Interp *interp, int withIntrinsic, int withLocal, int withSystem, Tcl_Obj *methodName, int nobjc, Tcl_Obj *CONST nobjv[]);
 static int NsfNSCopyCmdsCmd(Tcl_Interp *interp, Tcl_Obj *fromNs, Tcl_Obj *toNs);
 static int NsfNSCopyVarsCmd(Tcl_Interp *interp, Tcl_Obj *fromNs, Tcl_Obj *toNs);
 static int NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *arguments);
-static int NsfObjectDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withFrame, int withLocal, int withSystem, Tcl_Obj *command, int nobjc, Tcl_Obj *CONST nobjv[]);
+static int NsfObjectDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withFrame, int withIntrinsic, int withLocal, int withSystem, Tcl_Obj *command, int nobjc, Tcl_Obj *CONST nobjv[]);
 static int NsfObjectExistsCmd(Tcl_Interp *interp, Tcl_Obj *value);
 static int NsfObjectPropertyCmd(Tcl_Interp *interp, NsfObject *objectName, int objectproperty);
 static int NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *objectName);
@@ -1336,12 +1336,13 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    int withLocal = (int )PTR2INT(pc.clientData[0]);
-    int withSystem = (int )PTR2INT(pc.clientData[1]);
-    Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[2];
+    int withIntrinsic = (int )PTR2INT(pc.clientData[0]);
+    int withLocal = (int )PTR2INT(pc.clientData[1]);
+    int withSystem = (int )PTR2INT(pc.clientData[2]);
+    Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[3];
 
     assert(pc.status == 0);
-    return NsfMyCmd(interp, withLocal, withSystem, methodName, objc-pc.lastObjc, objv+pc.lastObjc);
+    return NsfMyCmd(interp, withIntrinsic, withLocal, withSystem, methodName, objc-pc.lastObjc, objv+pc.lastObjc);
 
   }
 }
@@ -1415,12 +1416,13 @@
   } else {
     NsfObject *object = (NsfObject *)pc.clientData[0];
     int withFrame = (int )PTR2INT(pc.clientData[1]);
-    int withLocal = (int )PTR2INT(pc.clientData[2]);
-    int withSystem = (int )PTR2INT(pc.clientData[3]);
-    Tcl_Obj *command = (Tcl_Obj *)pc.clientData[4];
+    int withIntrinsic = (int )PTR2INT(pc.clientData[2]);
+    int withLocal = (int )PTR2INT(pc.clientData[3]);
+    int withSystem = (int )PTR2INT(pc.clientData[4]);
+    Tcl_Obj *command = (Tcl_Obj *)pc.clientData[5];
 
     assert(pc.status == 0);
-    return NsfObjectDispatchCmd(interp, object, withFrame, withLocal, withSystem, command, objc-pc.lastObjc, objv+pc.lastObjc);
+    return NsfObjectDispatchCmd(interp, object, withFrame, withIntrinsic, withLocal, withSystem, command, objc-pc.lastObjc, objv+pc.lastObjc);
 
   }
 }
@@ -2528,7 +2530,8 @@
   {"-per-object", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"parameter", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::my", NsfMyCmdStub, 4, {
+{"::nsf::my", NsfMyCmdStub, 5, {
+  {"-intrinsic", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-local", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-system", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"methodName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
@@ -2545,9 +2548,10 @@
 {"::nsf::next", NsfNextCmdStub, 1, {
   {"arguments", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::object::dispatch", NsfObjectDispatchCmdStub, 6, {
+{"::nsf::object::dispatch", NsfObjectDispatchCmdStub, 7, {
   {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL},
   {"-frame", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-intrinsic", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-local", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-system", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"command", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},