Index: generic/nsf.decls
===================================================================
diff -u -rcd96543a3a6fb25ec8e52548892d12d244208a1a -r531982261a0deb399b608a42d4469af3d3041399
--- generic/nsf.decls	(.../nsf.decls)	(revision cd96543a3a6fb25ec8e52548892d12d244208a1a)
+++ generic/nsf.decls	(.../nsf.decls)	(revision 531982261a0deb399b608a42d4469af3d3041399)
@@ -1,4 +1,4 @@
-# nx.decls --
+# -*- Tcl -*- nx.decls --
 #
 #	This file contains the declarations for all supported public
 #	functions that are exported by the Next scripting library via the stubs table.
@@ -72,68 +72,62 @@
 		           int flgs)
 }
 declare 14 generic {
-    int NsfErrMsg(Tcl_Interp *interp, char *msg, Tcl_FreeProc *type)
+    void NsfDStringPrintf(Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc)
 }
 declare 15 generic {
-    int NsfVarErrMsg(Tcl_Interp  *interp, ...)
+    int NsfPrintError(Tcl_Interp *interp, CONST char *fmt, ...)
 }
 declare 16 generic {
-    void NsfDStringPrintf(Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc)
-}
-declare 17 generic {
     int NsfErrInProc (Tcl_Interp *interp, Tcl_Obj *objName,
 		Tcl_Obj *clName, CONST char *procName)
 }
-declare 18 generic {
-   int NsfErrBadVal_(Tcl_Interp *interp, char *expected, char *value)
-}
-declare 19 generic {
+declare 17 generic {
     int NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *nm, CONST char *type, char *parameterName)
 }
-declare 20 generic {
+declare 18 generic {
     void NsfStackDump (Tcl_Interp *interp)
 }
-declare 21 generic {
+declare 19 generic {
     void NsfSetObjClientData(Nsf_Object *obj, ClientData data)
 }
-declare 22 generic {
+declare 20 generic {
     ClientData NsfGetObjClientData(Nsf_Object *obj)
 }
-declare 23 generic {
+declare 21 generic {
     void NsfSetClassClientData(Nsf_Class *cl, ClientData data)
 }
-declare 24 generic {
+declare 22 generic {
     ClientData NsfGetClassClientData(Nsf_Class *cl)
 }
-declare 25 generic {
+declare 23 generic {
     void NsfRequireObjNamespace(Tcl_Interp *interp, Nsf_Object *obj)
 }
-declare 26 generic {
+declare 24 generic {
     int NsfErrBadVal(Tcl_Interp *interp, char *context, char *expected, CONST char *value)
 }
-declare 27 generic {
+declare 25 generic {
         int NsfNextObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 }
-declare 28 generic {
+declare 26 generic {
         int  NsfCallMethodWithArgs(ClientData cd, Tcl_Interp *interp, 
                 Tcl_Obj *method, Tcl_Obj *arg,
        	         int objc, Tcl_Obj *CONST objv[], int flags)
 }
-declare 29 generic {
+declare 27 generic {
     int NsfObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, 
                                      char *arglist)
 }
-declare 30 generic {
+declare 28 generic {
     int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
-declare 31 generic {
+declare 29 generic {
    int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
-declare 32 generic {
+declare 30 generic {
     int NsfCreate(Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data,
             int objc, Tcl_Obj *CONST objv[])
 }