Index: generic/nsfDebug.c
===================================================================
diff -u -r67efaa622731c55726f20c509a775303bb99f4ff -r6af35a888e33da976e283271bb68060f34d91a9a
--- generic/nsfDebug.c	(.../nsfDebug.c)	(revision 67efaa622731c55726f20c509a775303bb99f4ff)
+++ generic/nsfDebug.c	(.../nsfDebug.c)	(revision 6af35a888e33da976e283271bb68060f34d91a9a)
@@ -3,7 +3,7 @@
  *
  *      Debugging facilities for the Next Scripting Framework.
  *
- *  Copyright (C) 1999-2014 Gustaf Neumann (a, b)
+ *  Copyright (C) 1999-2016 Gustaf Neumann (a, b)
  *  Copyright (C) 1999-2007 Uwe Zdun (a, b)
  *
  * (a) University of Essen
@@ -47,7 +47,7 @@
  *----------------------------------------------------------------------
  * NsfReportVars --
  *
- *    Report version numbers and configure options as tcl variables.
+ *    Report version numbers and configure options as Tcl variables.
  *
  * Results:
  *    None.
@@ -66,6 +66,7 @@
   nonnull_assert(interp != NULL);
 
   Tcl_SetVar(interp, "::nsf::version", NSF_VERSION, TCL_GLOBAL_ONLY);
+  Tcl_SetVar(interp, "::nsf::commit", NSF_COMMIT, TCL_GLOBAL_ONLY);
   Tcl_SetVar(interp, "::nsf::patchLevel", NSF_PATCHLEVEL, TCL_GLOBAL_ONLY);
 
   Tcl_SetVar(interp, "::nsf::config(development)",
@@ -126,19 +127,24 @@
   v = iPtr->varFramePtr;
   varCmdObj = Tcl_NewObj();
   fprintf (stderr, "     TCL STACK:\n");
-  if (f == 0) {
+  if (f == NULL) {
     fprintf(stderr, "- ");
   }
-  while (f) {
+  while (f != NULL) {
     Tcl_Obj *cmdObj = Tcl_NewObj();
+
     fprintf(stderr, "\tFrame=%p ", (void *)f);
-    if (f && f->isProcCallFrame && f->procPtr && f->procPtr->cmdPtr) {
+    if ((f != NULL)
+        && (f->isProcCallFrame != 0)
+        && (f->procPtr != NULL)
+        && (f->procPtr->cmdPtr != NULL)
+        ) {
       fprintf(stderr,"caller %p ", (void *)Tcl_CallFrame_callerPtr(f));
       fprintf(stderr,"callerV %p ", (void *)Tcl_CallFrame_callerVarPtr(f));
       Tcl_GetCommandFullName(interp, (Tcl_Command)f->procPtr->cmdPtr, cmdObj);
       fprintf(stderr, "%s (%p) lvl=%d\n", ObjStr(cmdObj), (void *)f->procPtr->cmdPtr, f->level);
     } else {
-        if (f && f->varTablePtr) {
+        if (f != NULL && f->varTablePtr != NULL) {
             fprintf(stderr, "var_table = %p ", (void *)f->varTablePtr);
         }
         fprintf(stderr, "- \n");