Index: generic/nsfDecls.h
===================================================================
diff -u -rcd96543a3a6fb25ec8e52548892d12d244208a1a -r531982261a0deb399b608a42d4469af3d3041399
--- generic/nsfDecls.h	(.../nsfDecls.h)	(revision cd96543a3a6fb25ec8e52548892d12d244208a1a)
+++ generic/nsfDecls.h	(.../nsfDecls.h)	(revision 531982261a0deb399b608a42d4469af3d3041399)
@@ -104,117 +104,105 @@
 				Tcl_Interp *interp, CONST char *name1,
 				CONST char *name2, int flgs);
 #endif
-#ifndef NsfErrMsg_TCL_DECLARED
-#define NsfErrMsg_TCL_DECLARED
-/* 14 */
-EXTERN int		NsfErrMsg(Tcl_Interp *interp, char *msg,
-				Tcl_FreeProc *type);
-#endif
-#ifndef NsfVarErrMsg_TCL_DECLARED
-#define NsfVarErrMsg_TCL_DECLARED
-/* 15 */
-EXTERN int		NsfVarErrMsg(Tcl_Interp *interp, ...);
-#endif
 #ifndef NsfDStringPrintf_TCL_DECLARED
 #define NsfDStringPrintf_TCL_DECLARED
-/* 16 */
+/* 14 */
 EXTERN void		NsfDStringPrintf(Tcl_DString *dsPtr, CONST char *fmt,
 				va_list apSrc);
 #endif
+#ifndef NsfPrintError_TCL_DECLARED
+#define NsfPrintError_TCL_DECLARED
+/* 15 */
+EXTERN int		NsfPrintError(Tcl_Interp *interp, CONST char *fmt, ...);
+#endif
 #ifndef NsfErrInProc_TCL_DECLARED
 #define NsfErrInProc_TCL_DECLARED
-/* 17 */
+/* 16 */
 EXTERN int		NsfErrInProc(Tcl_Interp *interp, Tcl_Obj *objName,
 				Tcl_Obj *clName, CONST char *procName);
 #endif
-#ifndef NsfErrBadVal__TCL_DECLARED
-#define NsfErrBadVal__TCL_DECLARED
-/* 18 */
-EXTERN int		NsfErrBadVal_(Tcl_Interp *interp, char *expected,
-				char *value);
-#endif
 #ifndef NsfObjErrType_TCL_DECLARED
 #define NsfObjErrType_TCL_DECLARED
-/* 19 */
+/* 17 */
 EXTERN int		NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *nm,
 				CONST char *type, char *parameterName);
 #endif
 #ifndef NsfStackDump_TCL_DECLARED
 #define NsfStackDump_TCL_DECLARED
-/* 20 */
+/* 18 */
 EXTERN void		NsfStackDump(Tcl_Interp *interp);
 #endif
 #ifndef NsfSetObjClientData_TCL_DECLARED
 #define NsfSetObjClientData_TCL_DECLARED
-/* 21 */
+/* 19 */
 EXTERN void		NsfSetObjClientData(Nsf_Object *obj, ClientData data);
 #endif
 #ifndef NsfGetObjClientData_TCL_DECLARED
 #define NsfGetObjClientData_TCL_DECLARED
-/* 22 */
+/* 20 */
 EXTERN ClientData	NsfGetObjClientData(Nsf_Object *obj);
 #endif
 #ifndef NsfSetClassClientData_TCL_DECLARED
 #define NsfSetClassClientData_TCL_DECLARED
-/* 23 */
+/* 21 */
 EXTERN void		NsfSetClassClientData(Nsf_Class *cl, ClientData data);
 #endif
 #ifndef NsfGetClassClientData_TCL_DECLARED
 #define NsfGetClassClientData_TCL_DECLARED
-/* 24 */
+/* 22 */
 EXTERN ClientData	NsfGetClassClientData(Nsf_Class *cl);
 #endif
 #ifndef NsfRequireObjNamespace_TCL_DECLARED
 #define NsfRequireObjNamespace_TCL_DECLARED
-/* 25 */
+/* 23 */
 EXTERN void		NsfRequireObjNamespace(Tcl_Interp *interp,
 				Nsf_Object *obj);
 #endif
 #ifndef NsfErrBadVal_TCL_DECLARED
 #define NsfErrBadVal_TCL_DECLARED
-/* 26 */
+/* 24 */
 EXTERN int		NsfErrBadVal(Tcl_Interp *interp, char *context,
 				char *expected, CONST char *value);
 #endif
 #ifndef NsfNextObjCmd_TCL_DECLARED
 #define NsfNextObjCmd_TCL_DECLARED
-/* 27 */
+/* 25 */
 EXTERN int		NsfNextObjCmd(ClientData cd, Tcl_Interp *interp,
 				int objc, Tcl_Obj *CONST objv[]);
 #endif
 #ifndef NsfCallMethodWithArgs_TCL_DECLARED
 #define NsfCallMethodWithArgs_TCL_DECLARED
-/* 28 */
+/* 26 */
 EXTERN int		NsfCallMethodWithArgs(ClientData cd,
 				Tcl_Interp *interp, Tcl_Obj *method,
 				Tcl_Obj *arg, int objc,
 				Tcl_Obj *CONST objv[], int flags);
 #endif
 #ifndef NsfObjErrArgCnt_TCL_DECLARED
 #define NsfObjErrArgCnt_TCL_DECLARED
-/* 29 */
+/* 27 */
 EXTERN int		NsfObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName,
 				Tcl_Obj *methodName, char *arglist);
 #endif
 #ifndef NsfAddObjectMethod_TCL_DECLARED
 #define NsfAddObjectMethod_TCL_DECLARED
-/* 30 */
+/* 28 */
 EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
 				struct Nsf_Object *obj, CONST char *nm,
 				Tcl_ObjCmdProc *proc, ClientData cd,
 				Tcl_CmdDeleteProc *dp, int flags);
 #endif
 #ifndef NsfAddClassMethod_TCL_DECLARED
 #define NsfAddClassMethod_TCL_DECLARED
-/* 31 */
+/* 29 */
 EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
 				struct Nsf_Class *cl, CONST char *nm,
 				Tcl_ObjCmdProc *proc, ClientData cd,
 				Tcl_CmdDeleteProc *dp, int flags);
 #endif
 #ifndef NsfCreate_TCL_DECLARED
 #define NsfCreate_TCL_DECLARED
-/* 32 */
+/* 30 */
 EXTERN int		NsfCreate(Tcl_Interp *in, Nsf_Class *class,
 				Tcl_Obj *name, ClientData data, int objc,
 				Tcl_Obj *CONST objv[]);
@@ -242,25 +230,23 @@
     Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, int flgs); /* 11 */
     Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, int flgs); /* 12 */
     int (*nsfUnsetInstVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flgs); /* 13 */
-    int (*nsfErrMsg) (Tcl_Interp *interp, char *msg, Tcl_FreeProc *type); /* 14 */
-    int (*nsfVarErrMsg) (Tcl_Interp *interp, ...); /* 15 */
-    void (*nsfDStringPrintf) (Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc); /* 16 */
-    int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 17 */
-    int (*nsfErrBadVal_) (Tcl_Interp *interp, char *expected, char *value); /* 18 */
-    int (*nsfObjErrType) (Tcl_Interp *interp, Tcl_Obj *nm, CONST char *type, char *parameterName); /* 19 */
-    void (*nsfStackDump) (Tcl_Interp *interp); /* 20 */
-    void (*nsfSetObjClientData) (Nsf_Object *obj, ClientData data); /* 21 */
-    ClientData (*nsfGetObjClientData) (Nsf_Object *obj); /* 22 */
-    void (*nsfSetClassClientData) (Nsf_Class *cl, ClientData data); /* 23 */
-    ClientData (*nsfGetClassClientData) (Nsf_Class *cl); /* 24 */
-    void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *obj); /* 25 */
-    int (*nsfErrBadVal) (Tcl_Interp *interp, char *context, char *expected, CONST char *value); /* 26 */
-    int (*nsfNextObjCmd) (ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 27 */
-    int (*nsfCallMethodWithArgs) (ClientData cd, Tcl_Interp *interp, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 28 */
-    int (*nsfObjErrArgCnt) (Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist); /* 29 */
-    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 30 */
-    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 31 */
-    int (*nsfCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 32 */
+    void (*nsfDStringPrintf) (Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc); /* 14 */
+    int (*nsfPrintError) (Tcl_Interp *interp, CONST char *fmt, ...); /* 15 */
+    int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 16 */
+    int (*nsfObjErrType) (Tcl_Interp *interp, Tcl_Obj *nm, CONST char *type, char *parameterName); /* 17 */
+    void (*nsfStackDump) (Tcl_Interp *interp); /* 18 */
+    void (*nsfSetObjClientData) (Nsf_Object *obj, ClientData data); /* 19 */
+    ClientData (*nsfGetObjClientData) (Nsf_Object *obj); /* 20 */
+    void (*nsfSetClassClientData) (Nsf_Class *cl, ClientData data); /* 21 */
+    ClientData (*nsfGetClassClientData) (Nsf_Class *cl); /* 22 */
+    void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *obj); /* 23 */
+    int (*nsfErrBadVal) (Tcl_Interp *interp, char *context, char *expected, CONST char *value); /* 24 */
+    int (*nsfNextObjCmd) (ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 25 */
+    int (*nsfCallMethodWithArgs) (ClientData cd, Tcl_Interp *interp, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 26 */
+    int (*nsfObjErrArgCnt) (Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist); /* 27 */
+    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 28 */
+    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 29 */
+    int (*nsfCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 30 */
 } NsfStubs;
 
 #ifdef __cplusplus
@@ -330,81 +316,73 @@
 #define NsfUnsetInstVar2 \
 	(nsfStubsPtr->nsfUnsetInstVar2) /* 13 */
 #endif
-#ifndef NsfErrMsg
-#define NsfErrMsg \
-	(nsfStubsPtr->nsfErrMsg) /* 14 */
-#endif
-#ifndef NsfVarErrMsg
-#define NsfVarErrMsg \
-	(nsfStubsPtr->nsfVarErrMsg) /* 15 */
-#endif
 #ifndef NsfDStringPrintf
 #define NsfDStringPrintf \
-	(nsfStubsPtr->nsfDStringPrintf) /* 16 */
+	(nsfStubsPtr->nsfDStringPrintf) /* 14 */
 #endif
+#ifndef NsfPrintError
+#define NsfPrintError \
+	(nsfStubsPtr->nsfPrintError) /* 15 */
+#endif
 #ifndef NsfErrInProc
 #define NsfErrInProc \
-	(nsfStubsPtr->nsfErrInProc) /* 17 */
+	(nsfStubsPtr->nsfErrInProc) /* 16 */
 #endif
-#ifndef NsfErrBadVal_
-#define NsfErrBadVal_ \
-	(nsfStubsPtr->nsfErrBadVal_) /* 18 */
-#endif
 #ifndef NsfObjErrType
 #define NsfObjErrType \
-	(nsfStubsPtr->nsfObjErrType) /* 19 */
+	(nsfStubsPtr->nsfObjErrType) /* 17 */
 #endif
 #ifndef NsfStackDump
 #define NsfStackDump \
-	(nsfStubsPtr->nsfStackDump) /* 20 */
+	(nsfStubsPtr->nsfStackDump) /* 18 */
 #endif
 #ifndef NsfSetObjClientData
 #define NsfSetObjClientData \
-	(nsfStubsPtr->nsfSetObjClientData) /* 21 */
+	(nsfStubsPtr->nsfSetObjClientData) /* 19 */
 #endif
 #ifndef NsfGetObjClientData
 #define NsfGetObjClientData \
-	(nsfStubsPtr->nsfGetObjClientData) /* 22 */
+	(nsfStubsPtr->nsfGetObjClientData) /* 20 */
 #endif
 #ifndef NsfSetClassClientData
 #define NsfSetClassClientData \
-	(nsfStubsPtr->nsfSetClassClientData) /* 23 */
+	(nsfStubsPtr->nsfSetClassClientData) /* 21 */
 #endif
 #ifndef NsfGetClassClientData
 #define NsfGetClassClientData \
-	(nsfStubsPtr->nsfGetClassClientData) /* 24 */
+	(nsfStubsPtr->nsfGetClassClientData) /* 22 */
 #endif
 #ifndef NsfRequireObjNamespace
 #define NsfRequireObjNamespace \
-	(nsfStubsPtr->nsfRequireObjNamespace) /* 25 */
+	(nsfStubsPtr->nsfRequireObjNamespace) /* 23 */
 #endif
 #ifndef NsfErrBadVal
 #define NsfErrBadVal \
-	(nsfStubsPtr->nsfErrBadVal) /* 26 */
+	(nsfStubsPtr->nsfErrBadVal) /* 24 */
 #endif
 #ifndef NsfNextObjCmd
 #define NsfNextObjCmd \
-	(nsfStubsPtr->nsfNextObjCmd) /* 27 */
+	(nsfStubsPtr->nsfNextObjCmd) /* 25 */
 #endif
 #ifndef NsfCallMethodWithArgs
 #define NsfCallMethodWithArgs \
-	(nsfStubsPtr->nsfCallMethodWithArgs) /* 28 */
+	(nsfStubsPtr->nsfCallMethodWithArgs) /* 26 */
 #endif
 #ifndef NsfObjErrArgCnt
 #define NsfObjErrArgCnt \
-	(nsfStubsPtr->nsfObjErrArgCnt) /* 29 */
+	(nsfStubsPtr->nsfObjErrArgCnt) /* 27 */
 #endif
 #ifndef NsfAddObjectMethod
 #define NsfAddObjectMethod \
-	(nsfStubsPtr->nsfAddObjectMethod) /* 30 */
+	(nsfStubsPtr->nsfAddObjectMethod) /* 28 */
 #endif
 #ifndef NsfAddClassMethod
 #define NsfAddClassMethod \
-	(nsfStubsPtr->nsfAddClassMethod) /* 31 */
+	(nsfStubsPtr->nsfAddClassMethod) /* 29 */
 #endif
 #ifndef NsfCreate
 #define NsfCreate \
-	(nsfStubsPtr->nsfCreate) /* 32 */
+	(nsfStubsPtr->nsfCreate) /* 30 */
 #endif
 
 #endif /* defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) */