merge trunk

9 files changed, 12 insertions, 12 deletions

diff --git a/generic/regcomp.c b/generic/regcomp.c
index 7bd9483..1f6c2f0 100644
--- a/generic/regcomp.c
+++ b/generic/regcomp.c
@@ -592,7 +592,7 @@ makesearch(
 		break;
 	    }
 	}
- 
+
 	/*
 	 * We want to mark states as being in the list already by having non
 	 * NULL tmp fields, but we can't just store the old slist value in tmp
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 20f5710..1d76a5b 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -38,7 +38,7 @@ static int		UniCharIsHexDigit(int character);
  * UTF-8 literal string containing all Unicode space characters [TIP #413]
  */
 
-const char tclDefaultTrimSet[] = 
+const char tclDefaultTrimSet[] =
 	"\x09\x0a\x0b\x0c\x0d " /* ASCII */
 	"\xc0\x80" /*     nul (U+0000) */
 	"\xc2\x85" /*     next line (U+0085) */
@@ -2884,7 +2884,7 @@ StringCatCmd(
 	Tcl_AppendObjToObj(objResultPtr, objv[i]);
     }
     Tcl_SetObjResult(interp, objResultPtr);
-    
+
     return TCL_OK;
 }
 
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 4be5714..ff97adf 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -3115,7 +3115,7 @@ TclAttemptCompileProc(
     result = cmdPtr->compileProc(interp, parsePtr, cmdPtr, envPtr);
 
     /*
-     * Undo the shift. 
+     * Undo the shift.
      */
 
     mapPtr->loc[eclIndex].line -= (depth - 1);
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 7aa07eb..b799375 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -126,7 +126,7 @@ typedef struct Channel {
  */
 
 typedef struct ChannelState {
-    char *channelName;	/* The name of the channel instance in Tcl
+    char *channelName;		/* The name of the channel instance in Tcl
 				 * commands. Storage is owned by the generic
 				 * IO code, is dynamically allocated. */
     int	flags;			/* ORed combination of the flags defined
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 70f705b..3a09b0c 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -623,7 +623,7 @@ Tcl_MainEx(
 
     if (!Tcl_InterpDeleted(interp) && !Tcl_LimitExceeded(interp)) {
 	Tcl_Obj *cmd = Tcl_ObjPrintf("exit %d", exitCode);
-	    
+
 	Tcl_IncrRefCount(cmd);
 	Tcl_EvalObjEx(interp, cmd, TCL_EVAL_GLOBAL);
 	Tcl_DecrRefCount(cmd);
@@ -721,7 +721,7 @@ TclFullFinalizationRequested(void)
     const char *fin;
     Tcl_DString ds;
     int finalize = 0;
-    
+
     fin = TclGetEnv("TCL_FINALIZE_ON_EXIT", &ds);
     finalize = ((fin != NULL) && strcmp(fin, "0"));
     if (fin != NULL) {
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index ec5d0e6..b269e9a 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -357,7 +357,7 @@ PkgRequireCore(
 	if (pkgPtr->clientData != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "circular package dependency:"
-		    " attempt to provide %s %s requires %s", 
+		    " attempt to provide %s %s requires %s",
 		    name, (char *) pkgPtr->clientData, name));
 	    AddRequirementsToResult(interp, reqc, reqv);
 	    Tcl_SetErrorCode(interp, "TCL", "PACKAGE", "CIRCULARITY", NULL);
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 4e4ce41..7111e8f 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -1107,7 +1107,7 @@ TclFinalizeThreadAlloc(void)
  * TclFinalizeThreadAllocThread --
  *
  *	This procedure is used to destroy single thread private resources used
- *	in this file. 
+ *	in this file.
  * Called in TclpFinalizeThreadData when a thread exits (Tcl_FinalizeThread).
  *
  * Results:
diff --git a/generic/tclVar.c b/generic/tclVar.c
index e18d472..1048917 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -6166,10 +6166,10 @@ CompareVarKeys(
     /*
      * If the object pointers are the same then they match.
      * OPT: this comparison was moved to the caller
-     
+
        if (objPtr1 == objPtr2) return 1;
     */
-    
+
     /*
      * Don't use Tcl_GetStringFromObj as it would prevent l1 and l2 being in a
      * register.
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index e4369b1..5bd896d 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1534,7 +1534,7 @@ Tcl_ZlibDeflate(
     if (!interp) {
 	return TCL_ERROR;
     }
- 
+
     /*
      * Compressed format is specified by the wbits parameter. See zlib.h for
      * details.