From b49c883bbe8c5aa0620b7bc648e3172b784ef892 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 4 Jul 2016 20:39:43 +0000
Subject: Fixup the ensemble rewrite conversions.

---
 generic/tclEnsemble.c | 7 +------
 generic/tclExecute.c  | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 17ab35b..11ec3fc 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -1852,12 +1852,7 @@ NsEnsembleImplementationCmdNR(
 
 	Tcl_ListObjLength(NULL, prefixObj, &prefixObjc);
 
-	if (0 && objc == 2) {
-	/*
-	 * TODO: This branch is disabled because it botches or exposes
-	 * something wrong with nested ensemble usage messages. See
-	 * tests oo-16.1 and oo-17.1
-	 */
+	if (objc == 2) {
 	    copyPtr = prefixObj;
 	    Tcl_IncrRefCount(copyPtr);
 	    TclNRAddCallback(interp, FreeObj, copyPtr, NULL, NULL, NULL);
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 355b667..1389382 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2081,8 +2081,6 @@ TclNRExecuteByteCode(
      * Push the callback for bytecode execution
      */
 
-    TclResetRewriteEnsemble(interp, 1);
-
     TclNRAddCallback(interp, TEBCresume, TD, /* pc */ NULL,
 	    /* cleanup */ INT2PTR(0), NULL);
     return TCL_OK;
-- 
cgit v0.12