Fix the generated copyright sections in the HTML help file.

generic/tclCmdAH.c

@@ -1597,7 +1597,7 @@ FileAttrIsOwnedCmd(
     Tcl_Obj *const objv[])
 {
 #ifdef __CYGWIN__
-#define geteuid() (short)(geteuid)()
+#define geteuid() (short)(geteuid)() 
 #endif
 #if !defined(_WIN32)
     Tcl_StatBuf buf;

generic/tclCompile.c

@@ -1781,17 +1781,9 @@ CompileCmdLiteral(
     CompileEnv *envPtr)
 {
     int numBytes;
-    const char *bytes;
-    Command *cmdPtr;
-    int cmdLitIdx, extraLiteralFlags = LITERAL_CMD_NAME;
-
-    cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, cmdObj);
-    if ((cmdPtr != NULL) && (cmdPtr->flags & CMD_VIA_RESOLVER)) {
-	extraLiteralFlags |= LITERAL_UNSHARED;
-    }
-
-    bytes = Tcl_GetStringFromObj(cmdObj, &numBytes);
-    cmdLitIdx = TclRegisterLiteral(envPtr, (char *)bytes, numBytes, extraLiteralFlags);
+    const char *bytes = Tcl_GetStringFromObj(cmdObj, &numBytes);
+    int cmdLitIdx = TclRegisterNewCmdLiteral(envPtr, bytes, numBytes);
+    Command *cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, cmdObj);
 
     if (cmdPtr) {
 	TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, cmdLitIdx), cmdPtr);

generic/tclCompile.h

@@ -1208,7 +1208,6 @@ MODULE_SCOPE int	TclPushProcCallFrame(ClientData clientData,
 
 #define LITERAL_ON_HEAP		0x01
 #define LITERAL_CMD_NAME	0x02
-#define LITERAL_UNSHARED	0x04
 
 /*
  * Form of TclRegisterLiteral with flags == 0. In that case, it is safe to

generic/tclEnsemble.c

@@ -3306,7 +3306,7 @@ CompileToInvokedCommand(
     Tcl_Token *tokPtr;
     Tcl_Obj *objPtr, **words;
     char *bytes;
-    int length, i, numWords, cmdLit, extraLiteralFlags = LITERAL_CMD_NAME;
+    int length, i, numWords, cmdLit;
     DefineLineInformation;
 
     /*
@@ -3349,10 +3349,7 @@ CompileToInvokedCommand(
     objPtr = Tcl_NewObj();
     Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr, objPtr);
     bytes = Tcl_GetStringFromObj(objPtr, &length);
-    if ((cmdPtr != NULL) && (cmdPtr->flags & CMD_VIA_RESOLVER)) {
-	extraLiteralFlags |= LITERAL_UNSHARED;
-    }
-    cmdLit = TclRegisterLiteral(envPtr, (char *)bytes, length, extraLiteralFlags);
+    cmdLit = TclRegisterNewCmdLiteral(envPtr, bytes, length);
     TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, cmdLit), cmdPtr);
     TclEmitPush(cmdLit, envPtr);
     TclDecrRefCount(objPtr);

generic/tclExecute.c

@@ -3173,7 +3173,7 @@ TEBCresume(
 	    Tcl_Obj *copyPtr = Tcl_NewListObj(objc - opnd + 1, NULL);
 
 	    Tcl_ListObjAppendElement(NULL, copyPtr, objPtr);
-	    Tcl_ListObjReplace(NULL, copyPtr, LIST_MAX, 0,
+	    Tcl_ListObjReplace(NULL, copyPtr, LIST_MAX, 0, 
 		    objc - opnd, objv + opnd);
 	    Tcl_DecrRefCount(objPtr);
 	    objPtr = copyPtr;

generic/tclInt.h

@@ -1677,13 +1677,11 @@ typedef struct Command {
  * (these last two flags are defined in tcl.h)
  */
 
-#define CMD_IS_DELETED		    0x01
-#define CMD_TRACE_ACTIVE	    0x02
-#define CMD_HAS_EXEC_TRACES	    0x04
-#define CMD_COMPILES_EXPANDED	    0x08
+#define CMD_IS_DELETED		    0x1
+#define CMD_TRACE_ACTIVE	    0x2
+#define CMD_HAS_EXEC_TRACES	    0x4
+#define CMD_COMPILES_EXPANDED	    0x8
 #define CMD_REDEF_IN_PROGRESS	    0x10
-#define CMD_VIA_RESOLVER	    0x20
-
 
 /*
  *----------------------------------------------------------------

generic/tclLiteral.c

@@ -214,7 +214,7 @@ TclCreateLiteral(
 	    if (globalPtrPtr) {
 		*globalPtrPtr = globalPtr;
 	    }
-	    if ((flags & LITERAL_ON_HEAP)) {
+	    if (flags & LITERAL_ON_HEAP) {
 		ckfree(bytes);
 	    }
 	    globalPtr->refCount++;
@@ -222,7 +222,7 @@ TclCreateLiteral(
 	}
     }
     if (!newPtr) {
-	if ((flags & LITERAL_ON_HEAP)) {
+	if (flags & LITERAL_ON_HEAP) {
 	    ckfree(bytes);
 	}
 	return NULL;
@@ -234,23 +234,14 @@ TclCreateLiteral(
      */
 
     TclNewObj(objPtr);
-    if ((flags & LITERAL_ON_HEAP)) {
+    Tcl_IncrRefCount(objPtr);
+    if (flags & LITERAL_ON_HEAP) {
 	objPtr->bytes = bytes;
 	objPtr->length = length;
     } else {
 	TclInitStringRep(objPtr, bytes, length);
     }
 
-    if ((flags & LITERAL_UNSHARED)) {
-	/*
-	 * Make clear, that no global value is returned
-	 */
-	if (globalPtrPtr != NULL) {
-	    *globalPtrPtr = NULL;
-	}
-	return objPtr;
-    }
-
 #ifdef TCL_COMPILE_DEBUG
     if (LookupLiteralEntry((Tcl_Interp *) iPtr, objPtr) != NULL) {
 	Tcl_Panic("%s: literal \"%.*s\" found globally but shouldn't be",
@@ -260,7 +251,6 @@ TclCreateLiteral(
 
     globalPtr = ckalloc(sizeof(LiteralEntry));
     globalPtr->objPtr = objPtr;
-    Tcl_IncrRefCount(objPtr);
     globalPtr->refCount = 1;
     globalPtr->nsPtr = nsPtr;
     globalPtr->nextPtr = globalTablePtr->buckets[globalHash];
@@ -408,7 +398,7 @@ TclRegisterLiteral(
 	if ((objPtr->length == length) && ((length == 0)
 		|| ((objPtr->bytes[0] == bytes[0])
 		&& (memcmp(objPtr->bytes, bytes, (unsigned) length) == 0)))) {
-	    if ((flags & LITERAL_ON_HEAP)) {
+	    if (flags & LITERAL_ON_HEAP) {
 		ckfree(bytes);
 	    }
 	    objIndex = (localPtr - envPtr->literalArrayPtr);
@@ -427,7 +417,7 @@ TclRegisterLiteral(
      * the namespace as the interp's global NS.
      */
 
-    if ((flags & LITERAL_CMD_NAME)) {
+    if (flags & LITERAL_CMD_NAME) {
 	if ((length >= 2) && (bytes[0] == ':') && (bytes[1] == ':')) {
 	    nsPtr = iPtr->globalNsPtr;
 	} else {
@@ -441,13 +431,12 @@ TclRegisterLiteral(
      * Is it in the interpreter's global literal table? If not, create it.
      */
 
-    globalPtr = NULL;
     objPtr = TclCreateLiteral(iPtr, bytes, length, hash, &new, nsPtr, flags,
 	    &globalPtr);
     objIndex = AddLocalLiteralEntry(envPtr, objPtr, localHash);
 
 #ifdef TCL_COMPILE_DEBUG
-    if (globalPtr != NULL && globalPtr->refCount < 1) {
+    if (globalPtr->refCount < 1) {
 	Tcl_Panic("%s: global literal \"%.*s\" had bad refCount %d",
 		"TclRegisterLiteral", (length>60? 60 : length), bytes,
 		globalPtr->refCount);
@@ -1163,6 +1152,13 @@ TclVerifyLocalLiteralTable(
 			"TclVerifyLocalLiteralTable",
 			(length>60? 60 : length), bytes, localPtr->refCount);
 	    }
+	    if (LookupLiteralEntry((Tcl_Interp *) envPtr->iPtr,
+		    localPtr->objPtr) == NULL) {
+		bytes = Tcl_GetStringFromObj(localPtr->objPtr, &length);
+		Tcl_Panic("%s: local literal \"%.*s\" is not global",
+			"TclVerifyLocalLiteralTable",
+			(length>60? 60 : length), bytes);
+	    }
 	    if (localPtr->objPtr->bytes == NULL) {
 		Tcl_Panic("%s: literal has NULL string rep",
 			"TclVerifyLocalLiteralTable");

generic/tclNamesp.c

@@ -2566,9 +2566,7 @@ Tcl_FindCommand(
 	}
 
 	if (result == TCL_OK) {
-	    ((Command *)cmd)->flags |= CMD_VIA_RESOLVER;
 	    return cmd;
-
 	} else if (result != TCL_CONTINUE) {
 	    return NULL;
 	}
@@ -2660,7 +2658,6 @@ Tcl_FindCommand(
     }
 
     if (cmdPtr != NULL) {
-	cmdPtr->flags  &= ~CMD_VIA_RESOLVER;
 	return (Tcl_Command) cmdPtr;
     }
 

generic/tclObj.c

@@ -4219,10 +4219,7 @@ TclSetCmdNameObj(
     const char *name;
 
     if (objPtr->typePtr == &tclCmdNameType) {
-	resPtr = objPtr->internalRep.twoPtrValue.ptr1;
-	if (resPtr != NULL && resPtr->cmdPtr == cmdPtr) {
-	    return;
-	}
+	return;
     }
 
     cmdPtr->refCount++;

generic/tclTest.c

@@ -7299,82 +7299,23 @@ InterpCmdResolver(
     CallFrame *varFramePtr = iPtr->varFramePtr;
     Proc *procPtr = (varFramePtr->isProcCallFrame & FRAME_IS_PROC) ?
             varFramePtr->procPtr : NULL;
-    Namespace *callerNsPtr = varFramePtr->nsPtr;
-    Tcl_Command resolvedCmdPtr = NULL;
+    Namespace *ns2NsPtr = (Namespace *)
+            Tcl_FindNamespace(interp, "::ns2", NULL, 0);
 
-    /*
-     * Just do something special on a cmd literal "z" in two cases:
-     *  A)  when the caller is a proc "x", and the proc is either in "::" or in "::ns2".
-     *  B) the caller's namespace is "ctx1" or "ctx2"
-     */
-    if ( (name[0] == 'z') && (name[1] == '\0') ) {
-        Namespace *ns2NsPtr = (Namespace *) Tcl_FindNamespace(interp, "::ns2", NULL, 0);
-
-        if (procPtr != NULL
-            && ((procPtr->cmdPtr->nsPtr == iPtr->globalNsPtr)
-                || (ns2NsPtr != NULL && procPtr->cmdPtr->nsPtr == ns2NsPtr)
-                )
-            ) {
-            /*
-             * Case A)
-             *
-             *    - The context, in which this resolver becomes active, is
-             *      determined by the name of the caller proc, which has to be
-             *      named "x".
-             *
-             *    - To determine the name of the caller proc, the proc is taken
-             *      from the topmost stack frame.
-             *
-             *    - Note that the context is NOT provided during byte-code
-             *      compilation (e.g. in TclProcCompileProc)
-             *
-             *   When these conditions hold, this function resolves the
-             *   passed-in cmd literal into a cmd "y", which is taken from the
-             *   the global namespace (for simplicity).
-             */
-
-            const char *callingCmdName =
+    if (procPtr && (procPtr->cmdPtr->nsPtr == iPtr->globalNsPtr
+            || (ns2NsPtr && procPtr->cmdPtr->nsPtr == ns2NsPtr))) {
+        const char *callingCmdName =
                 Tcl_GetCommandName(interp, (Tcl_Command) procPtr->cmdPtr);
 
-            if ( callingCmdName[0] == 'x' && callingCmdName[1] == '\0' ) {
-                resolvedCmdPtr = Tcl_FindCommand(interp, "y", NULL, TCL_GLOBAL_ONLY);
+        if ((callingCmdName[0] == 'x') && (callingCmdName[1] == '\0')
+                && (name[0] == 'z') && (name[1] == '\0')) {
+            Tcl_Command sourceCmdPtr = Tcl_FindCommand(interp, "y", NULL,
+                    TCL_GLOBAL_ONLY);
+
+            if (sourceCmdPtr != NULL) {
+                *rPtr = sourceCmdPtr;
+                return TCL_OK;
             }
-        } else if (callerNsPtr != NULL) {
-            /*
-             * Case B)
-             *
-             *    - The context, in which this resolver becomes active, is
-             *      determined by the name of the parent namespace, which has
-             *      to be named "ctx1" or "ctx2".
-             *
-             *    - To determine the name of the parent namesace, it is taken
-             *      from the 2nd highest stack frame.
-             *
-             *    - Note that the context can be provided during byte-code
-             *      compilation (e.g. in TclProcCompileProc)
-             *
-             *   When these conditions hold, this function resolves the
-             *   passed-in cmd literal into a cmd "y" or "Y" depending on the
-             *   context. The resolved procs are taken from the the global
-             *   namespace (for simplicity).
-             */
-
-            CallFrame *parentFramePtr = varFramePtr->callerPtr;
-            char *context = parentFramePtr != NULL ? parentFramePtr->nsPtr->name : "(NULL)";
-
-            if (strcmp(context, "ctx1") == 0 && (name[0] == 'z') && (name[1] == '\0')) {
-                resolvedCmdPtr = Tcl_FindCommand(interp, "y", NULL, TCL_GLOBAL_ONLY);
-                /* fprintf(stderr, "... y ==> %p\n", resolvedCmdPtr);*/
-
-            } else if (strcmp(context, "ctx2") == 0 && (name[0] == 'z') && (name[1] == '\0')) {
-                resolvedCmdPtr = Tcl_FindCommand(interp, "Y", NULL, TCL_GLOBAL_ONLY);
-                /*fprintf(stderr, "... Y ==> %p\n", resolvedCmdPtr);*/
-            }
-        }
-
-        if (resolvedCmdPtr != NULL) {
-            *rPtr = resolvedCmdPtr;
-            return TCL_OK;
         }
     }
     return TCL_CONTINUE;
@@ -7508,16 +7449,9 @@ TestInterpResolverCmd(
     int idx;
 #define RESOLVER_KEY "testInterpResolver"
 
-    if ((objc < 2) || (objc > 3)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "up|down ?interp?");
-	return TCL_ERROR;
-    }
-    if (objc == 3) {
-	interp = Tcl_GetSlave(interp, Tcl_GetString(objv[2]));
-	if (interp == NULL) {
-	    Tcl_AppendResult(interp, "provided interpreter not found", NULL);
-	    return TCL_ERROR;
-	}
+    if (objc != 2) {
+        Tcl_WrongNumArgs(interp, 1, objv, "up|down");
+ 	return TCL_ERROR;
     }
     if (Tcl_GetIndexFromObj(interp, objv[1], table, "operation", TCL_EXACT,
             &idx) != TCL_OK) {

generic/tclUtf.c

@@ -73,7 +73,16 @@ static const unsigned char totalBytes[256] = {
 #else
     1,1,1,1,1,1,1,1,
 #endif
-    1,1,1,1,1,1,1,1
+#if TCL_UTF_MAX > 4
+    5,5,5,5,
+#else
+    1,1,1,1,
+#endif
+#if TCL_UTF_MAX > 5
+    6,6,6,6
+#else
+    1,1,1,1
+#endif
 };
 
 /*
@@ -102,14 +111,14 @@ INLINE static int
 UtfCount(
     int ch)			/* The Tcl_UniChar whose size is returned. */
 {
-    if ((unsigned)(ch - 1) < (UNICODE_SELF - 1)) {
+    if ((ch > 0) && (ch < UNICODE_SELF)) {
 	return 1;
     }
     if (ch <= 0x7FF) {
 	return 2;
     }
 #if TCL_UTF_MAX > 3
-    if (((unsigned)(ch - 0x10000) <= 0xfffff)) {
+    if ((ch > 0xFFFF) && (ch <= 0x10FFFF)) {
 	return 4;
     }
 #endif
@@ -143,7 +152,7 @@ Tcl_UniCharToUtf(
 				 * large enough to hold the UTF-8 character
 				 * (at most TCL_UTF_MAX bytes). */
 {
-    if ((unsigned)(ch - 1) < (UNICODE_SELF - 1)) {
+    if ((ch > 0) && (ch < UNICODE_SELF)) {
 	buf[0] = (char) ch;
 	return 1;
     }
@@ -171,7 +180,11 @@ Tcl_UniCharToUtf(
 		}
 	    }
 #endif
-	    goto three;
+	three:
+	    buf[2] = (char) ((ch | 0x80) & 0xBF);
+	    buf[1] = (char) (((ch >> 6) | 0x80) & 0xBF);
+	    buf[0] = (char) ((ch >> 12) | 0xE0);
+	    return 3;
 	}
 
 #if TCL_UTF_MAX > 3
@@ -186,11 +199,7 @@ Tcl_UniCharToUtf(
     }
 
     ch = 0xFFFD;
-three:
-    buf[2] = (char) ((ch | 0x80) & 0xBF);
-    buf[1] = (char) (((ch >> 6) | 0x80) & 0xBF);
-    buf[0] = (char) ((ch >> 12) | 0xE0);
-    return 3;
+    goto three;
 }
 
 /*
@@ -305,6 +314,9 @@ Tcl_UtfToUniChar(
 	 * A two-byte-character lead-byte not followed by trail-byte
 	 * represents itself.
 	 */
+
+	*chPtr = (Tcl_UniChar) byte;
+	return 1;
     } else if (byte < 0xF0) {
 	if (((src[1] & 0xC0) == 0x80) && ((src[2] & 0xC0) == 0x80)) {
 	    /*
@@ -320,23 +332,31 @@ Tcl_UtfToUniChar(
 	 * A three-byte-character lead-byte not followed by two trail-bytes
 	 * represents itself.
 	 */
+
+	*chPtr = (Tcl_UniChar) byte;
+	return 1;
     }
 #if TCL_UTF_MAX > 3
-    else if (byte < 0xF8) {
-	if (((src[1] & 0xC0) == 0x80) && ((src[2] & 0xC0) == 0x80) && ((src[3] & 0xC0) == 0x80)) {
-	    /*
-	     * Four-byte-character lead byte followed by three trail bytes.
-	     */
+    {
+	int ch, total, trail;
 
-	    *chPtr = (Tcl_UniChar) (((byte & 0x0E) << 18) | ((src[1] & 0x3F) << 12)
-		    | ((src[2] & 0x3F) << 6) | (src[3] & 0x3F));
-	    return 4;
+	total = totalBytes[byte];
+	trail = total - 1;
+	if (trail > 0) {
+	    ch = byte & (0x3F >> trail);
+	    do {
+		src++;
+		if ((*src & 0xC0) != 0x80) {
+		    *chPtr = byte;
+		    return 1;
+		}
+		ch <<= 6;
+		ch |= (*src & 0x3F);
+		trail--;
+	    } while (trail > 0);
+	    *chPtr = ch;
+	    return total;
 	}
-
-	/*
-	 * A three-byte-character lead-byte not followed by two trail-bytes
-	 * represents itself.
-	 */
     }
 #endif
 

generic/tclVar.c

@@ -5193,16 +5193,13 @@ TclDeleteNamespaceVars(
 	VarHashRefCount(varPtr)++;	/* Make sure we get to remove from
 					 * hash. */
 	Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, objPtr);
-	UnsetVarStruct(varPtr, NULL, iPtr, /* part1 */ objPtr,
-		NULL, flags, -1);
+	UnsetVarStruct(varPtr, NULL, iPtr, /* part1 */ objPtr, NULL, flags,
+		-1);
+	Tcl_DecrRefCount(objPtr);	/* Free no longer needed obj */
 
 	/*
-	 * We just unset the variable. However, an unset trace might
-	 * have re-set it, or might have re-established traces on it.
-	 * This namespace and its vartable are going away unconditionally,
-	 * so we cannot let such things linger. That would be a leak.
-	 *
-	 * First we destroy all traces. ...
+	 * Remove the variable from the table and force it undefined in case
+	 * an unset trace brought it back from the dead.
 	 */
 
 	if (TclIsVarTraced(varPtr)) {
@@ -5226,17 +5223,6 @@ TclDeleteNamespaceVars(
 		}
 	    }
 	}
-
-	/*
-	 * ...and then, if the variable still holds a value, we unset it
-	 * again. This time with no traces left, we're sure it goes away.
-	 */
-
-	if (!TclIsVarUndefined(varPtr)) {
-	    UnsetVarStruct(varPtr, NULL, iPtr, /* part1 */ objPtr,
-		    NULL, flags, -1);
-	}
-	Tcl_DecrRefCount(objPtr); /* free no longer needed obj */
 	VarHashRefCount(varPtr)--;
 	VarHashDeleteEntry(varPtr);
     }

generic/tclZlib.c

@@ -2864,7 +2864,7 @@ ZlibTransformClose(
     Tcl_Interp *interp)
 {
     ZlibChannelData *cd = instanceData;
-    int e, written, result = TCL_OK;
+    int e, result = TCL_OK;
 
     /*
      * Delete the support timer.
@@ -2882,17 +2882,6 @@ ZlibTransformClose(
 	    cd->outStream.next_out = (Bytef *) cd->outBuffer;
 	    cd->outStream.avail_out = (unsigned) cd->outAllocated;
 	    e = deflate(&cd->outStream, Z_FINISH);
-	    written = cd->outAllocated - cd->outStream.avail_out;
-
-	    /*
-	     * Can't be sure that deflate() won't declare the buffer to be
-	     * full (with Z_BUF_ERROR) so handle that case.
-	     */
-
-	    if (e == Z_BUF_ERROR) {
-		e = Z_OK;
-		written = cd->outAllocated;
-	    }
 	    if (e != Z_OK && e != Z_STREAM_END) {
 		/* TODO: is this the right way to do errors on close? */
 		if (!TclInThreadExit()) {
@@ -2901,17 +2890,20 @@ ZlibTransformClose(
 		result = TCL_ERROR;
 		break;
 	    }
-	    if (written && Tcl_WriteRaw(cd->parent, cd->outBuffer, written) < 0) {
-		/* TODO: is this the right way to do errors on close?
-		 * Note: when close is called from FinalizeIOSubsystem then
-		 * interp may be NULL */
-		if (!TclInThreadExit() && interp) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "error while finalizing file: %s",
-			    Tcl_PosixError(interp)));
+	    if (cd->outStream.avail_out != (unsigned) cd->outAllocated) {
+		if (Tcl_WriteRaw(cd->parent, cd->outBuffer,
+			cd->outAllocated - cd->outStream.avail_out) < 0) {
+		    /* TODO: is this the right way to do errors on close?
+		     * Note: when close is called from FinalizeIOSubsystem
+		     * then interp may be NULL */
+		    if (!TclInThreadExit() && interp) {
+			Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+				"error while finalizing file: %s",
+				Tcl_PosixError(interp)));
+		    }
+		    result = TCL_ERROR;
+		    break;
 		}
-		result = TCL_ERROR;
-		break;
 	    }
 	} while (e != Z_STREAM_END);
 	(void) deflateEnd(&cd->outStream);
@@ -3092,17 +3084,7 @@ ZlibTransformOutput(
 	e = deflate(&cd->outStream, Z_NO_FLUSH);
 	produced = cd->outAllocated - cd->outStream.avail_out;
 
-	if ((e == Z_OK && produced > 0) || e == Z_BUF_ERROR) {
-	    /*
-	     * deflate() indicates that it is out of space by returning
-	     * Z_BUF_ERROR; in that case, we must write the whole buffer out
-	     * and retry to compress what is left.
-	     */
-
-	    if (e == Z_BUF_ERROR) {
-		produced = cd->outAllocated;
-		e = Z_OK;
-	    }
+	if (e == Z_OK && produced > 0) {
 	    if (Tcl_WriteRaw(cd->parent, cd->outBuffer, produced) < 0) {
 		*errorCodePtr = Tcl_GetErrno();
 		return -1;

library/auto.tcl

@@ -122,9 +122,11 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
     # uniquify $dirs in order
     array set seen {}
     foreach i $dirs {
-	# Make sure $i is unique under normalization. Avoid repeated [source].
+	# Take note that the [file normalize] below has been noted to cause
+	# difficulties for the freewrap utility.  See Bug 1072136.  Until
+	# freewrap resolves the matter, one might work around the problem by
+	# disabling that branch.
 	if {[interp issafe]} {
-	    # Safe interps have no [file normalize].
 	    set norm $i
 	} else {
 	    set norm [file normalize $i]
@@ -133,7 +135,10 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 	    continue
 	}
 	set seen($norm) {}
-
+	lappend uniqdirs $i
+    }
+    set dirs $uniqdirs
+    foreach i $dirs {
         set the_library $i
         set file [file join $i $initScript]
 

tests/resolver.test

@@ -187,7 +187,7 @@ test resolver-2.1 {compiled var resolver: Bug #3383616} -setup {
     # During the compilation the compiled var resolver, the resolve-specific
     # var info is allocated, during the execution of the body, the variable is
     # fetched and cached.
-    x
+    x;
     # During later calls, the cached variable is reused.
     x
     # When the proc is freed, the resolver-specific resolver var info is
@@ -196,121 +196,6 @@ test resolver-2.1 {compiled var resolver: Bug #3383616} -setup {
 } -cleanup {
     testinterpresolver down
 } -result {}
-
-
-#
-# The test resolver-3.1* test bad interactions of resolvers on the "global"
-# (per interp) literal pools. A resolver might resolve a cmd literal depending
-# on a context differently, whereas the cmd literal sharing assumed that the
-# namespace containing the literal solely determines the resolved cmd (and is
-# resolver-agnostic).
-#
-# In order to make the test cases for the per-interpreter cmd literal pool
-# reproducable and to minimize interactions between test cases, we use a slave
-# interpreter per test-case.
-#
-#
-# Testing resolver in namespace-based context "ctx1"
-#
-test resolver-3.1a {
-    interp command resolver,
-    resolve literal "z" in proc "x1" in context "ctx1"
-} -setup {
-
-    interp create i0
-    testinterpresolver up i0
-    i0 eval {
-	proc y {} { return yy }
-	namespace eval ::ns {
-	    proc x1 {} { z }
-	}
-    }
-} -constraints testinterpresolver -body {
-
-    set r [i0 eval {namespace eval ::ctx1 {
-	::ns::x1
-    }}]
-
-    return $r
-} -cleanup {
-    testinterpresolver down i0
-    interp delete i0
-} -result {yy}
-
-#
-# Testing resolver in namespace-based context "ctx2"
-#
-test resolver-3.1b {
-    interp command resolver,
-    resolve literal "z" in proc "x2" in context "ctx2"
-} -setup {
-
-    interp create i0
-    testinterpresolver up i0
-    i0 eval {
-	proc Y {} { return YY }
-	namespace eval ::ns {
-	    proc x2 {} { z }
-	}
-    }
-} -constraints testinterpresolver -body {
-
-    set r [i0 eval {namespace eval ::ctx2 {
-	::ns::x2
-    }}]
-
-    return $r
-} -cleanup {
-    testinterpresolver down i0
-    interp delete i0
-} -result {YY}
-
-#
-# Testing resolver in namespace-based context "ctx1" and "ctx2" in the same
-# interpreter.
-#
-
-test resolver-3.1c {
-    interp command resolver,
-    resolve literal "z" in proc "x1" in context "ctx1",
-    resolve literal "z" in proc "x2" in context "ctx2"
-
-    Test, whether the shared cmd literal created by the first byte-code
-    compilation interacts with the second one.
-} -setup {
-
-    interp create i0
-    testinterpresolver up i0
-
-    i0 eval {
-	proc y {} { return yy }
-	proc Y {} { return YY }
-	namespace eval ::ns {
-	    proc x1 {} { z }
-	    proc x2 {} { z }
-	}
-    }
-
-} -constraints testinterpresolver -body {
-
-    set r1 [i0 eval {namespace eval ::ctx1 {
-	::ns::x1
-    }}]
-
-    set r2 [i0 eval {namespace eval ::ctx2 {
-	::ns::x2
-    }}]
-
-    set r3 [i0 eval {namespace eval ::ctx1 {
-	::ns::x1
-    }}]
-
-    return [list $r1 $r2 $r3]
-} -cleanup {
-    testinterpresolver down i0
-    interp delete i0
-} -result {yy YY yy}
-
 
 cleanupTests
 return

tests/var.test

@@ -26,20 +26,6 @@ testConstraint testupvar [llength [info commands testupvar]]
 testConstraint testgetvarfullname [llength [info commands testgetvarfullname]]
 testConstraint testsetnoerr [llength [info commands testsetnoerr]]
 testConstraint memory [llength [info commands memory]]
-if {[testConstraint memory]} {
-    proc getbytes {} {
-        return [lindex [split [memory info] \n] 3 3]
-    }
-    proc leaktest {script {iterations 3}} {
-        set end [getbytes]
-        for {set i 0} {$i < $iterations} {incr i} {
-            uplevel 1 $script
-            set tmp $end
-            set end [getbytes]
-        }
-        return [expr {$end - $tmp}]
-    }
-}
 
 catch {rename p ""}
 catch {namespace delete test_ns_var}
@@ -593,22 +579,6 @@ test var-8.2 {TclDeleteNamespaceVars, "unset" traces on ns delete are called wit
     list [namespace delete test_ns_var] $::info
 } -result {{} {::test_ns_var::v {} u}}
 
-test var-8.3 {TclDeleteNamespaceVars, mem leak} -constraints memory -setup {
-    proc ::t {a i o} {
-	set $a 321
-    }
-} -body {
-    leaktest {
-	namespace eval n {
-	    variable v 123
-	    trace variable v u ::t
-	}
-	namespace delete n
-    }
-} -cleanup {
-    rename ::t {}
-} -result 0
-
 test var-9.1 {behaviour of TclGet/SetVar simple get/set} -setup {
     catch {unset u}
     catch {unset v}

tests/zlib.test

@@ -917,29 +917,6 @@ test zlib-12.1 {Tk Bug 9eb55debc5} -constraints zlib -setup {
 } -cleanup {
     $stream close
 } -result {12026 18000}
-test zlib-12.2 {Patrick Dunnigan's issue} -constraints zlib -setup {
-    set filesrc [makeFile {} test.input]
-    set filedst [makeFile {} test.output]
-    set f [open $filesrc "wb"]
-    for {set i 0} {$i < 10000} {incr i} {
-	puts -nonewline $f "x"
-    }
-    close $f
-} -body {
-    set fin [open $filesrc "rb"]
-    set fout [open $filedst "wb"]
-    set header [dict create filename "test.input" time 0]
-    try {
-	fcopy $fin [zlib push gzip $fout -header $header]
-    } finally {
-	close $fin
-	close $fout
-    }
-    file size $filedst
-} -cleanup {
-    removeFile $filesrc
-    removeFile $filedst
-} -result 4152
 
 ::tcltest::cleanupTests
 return

tools/tcltk-man2html-utils.tcl

@@ -57,9 +57,14 @@ proc copyright {copyright {level {}}} {
 }
 
 proc copyout {copyrights {level {}}} {
+    set count 0
     set out "<div class=\"copy\">"
     foreach c $copyrights {
+	if {$count > 0} {
+	    append out <BR>
+	}
 	append out "[copyright $c $level]\n"
+	incr count
     }
     append out "</div>"
     return $out

win/Makefile.in

@@ -81,7 +81,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE
 
 # To compile without backward compatibility and deprecated code uncomment the
 # following

win/makefile.vc

@@ -737,7 +737,7 @@ gentommath_h:
 !ifndef HHC
 HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
 !endif
-HTMLDIR=$(OUT_DIR)\html
+HTMLDIR=$(ROOT)\html
 HTMLBASE=TclTk$(VERSION)
 HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
@@ -745,27 +745,25 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 htmlhelp: chmsetup $(CHMFILE)
 
 $(CHMFILE): $(DOCDIR)\*
-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
 	@echo Compiling HTML help project
-	-$(HHC) <<$(HHPFILE) >NUL
+	@$(HHC) <<$(HHPFILE) >NUL
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=$(HTMLBASE).chm
-Default topic=contents.htm
 Display compile progress=no
 Error log file=$(HTMLBASE).log
-Full-text search=Yes
 Language=0x409 English (United States)
 Title=Tcl/Tk $(DOT_VERSION) Help
 [FILES]
 contents.htm
 docs.css
-Keywords\*.htm
-TclCmd\*.htm
-TclLib\*.htm
-TkCmd\*.htm
-TkLib\*.htm
-UserCmd\*.htm
+Keywords
+TclCmd
+TclLib
+TkCmd
+TkLib
+UserCmd
 <<
 
 chmsetup:

win/rules.vc

@@ -159,7 +159,7 @@ DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ
 !endif
 
-COMPILERFLAGS  =-W3 /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING
+COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE
 
 # In v13 -GL and -YX are incompatible.
 !if [nmakehlp -c -YX]
@@ -230,10 +230,6 @@ STATIC_BUILD	= 1
 !else
 STATIC_BUILD	= 0
 !endif
-!if [nmakehlp -f $(OPTS) "nomsvcrt"]
-!message *** Doing nomsvcrt
-MSVCRT		= 0
-!else
 !if [nmakehlp -f $(OPTS) "msvcrt"]
 !message *** Doing msvcrt
 MSVCRT		= 1
@@ -244,7 +240,6 @@ MSVCRT		= 1
 MSVCRT		= 0
 !endif
 !endif
-!endif
 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
 !message *** Doing staticpkg
 TCL_USE_STATIC_PACKAGES	= 1

win/tclWinFile.c

@@ -3166,8 +3166,8 @@ TclWinFileOwned(
            case we are in all likelihood not the owner */
         return 0;
     }
-
-    /*
+        
+    /* 
      * Getting the current process SID is a multi-step process.
      * We make the assumption that if a call fails, this process is
      * so underprivileged it could not possibly own anything. Normally
@@ -3191,10 +3191,10 @@ TclWinFileOwned(
         LocalFree(secd);            /* Also frees ownerSid */
     if (buf)
         ckfree(buf);
-
+    
     return (owned != 0);        /* Convert non-0 to 1 */
 }
-
+    
 /*
  * Local Variables:
  * mode: c

win/tclWinPipe.c

@@ -1337,7 +1337,7 @@ ApplicationType(
 	Tcl_DStringFree(&ds);
 
 	ext = strrchr(fullName, '.');
-	if ((ext != NULL) &&
+	if ((ext != NULL) && 
             (strcasecmp(ext, ".cmd") == 0 || strcasecmp(ext, ".bat") == 0)) {
 	    applType = APPL_DOS;
 	    break;

win/tclWinPort.h

@@ -360,7 +360,7 @@ typedef DWORD_PTR * PDWORD_PTR;
 #   define S_IFLNK        0120000  /* Symbolic Link */
 #endif
 
-/*
+/* 
  * Windows compilers do not define S_IFBLK. However, Tcl uses it in
  * GetTypeFromMode to identify blockSpecial devices based on the
  * value in the statsbuf st_mode field. We have no other way to pass this