merge trunk

3 files changed, 5 insertions, 3 deletions

diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 516e9b0..354d329 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -1424,9 +1424,9 @@ DestroyMenuEntry(
 		if (menuRefPtr->menuPtr == destroyThis) {
 		    menuRefPtr->menuPtr = NULL;
 		}
-		if (destroyThis != NULL) {
-		    TkDestroyMenu(destroyThis);
-		}
+	    }
+	    if (destroyThis != NULL) {
+		TkDestroyMenu(destroyThis);
 	    }
 	} else {
 	    UnhookCascadeEntry(mePtr);
diff --git a/tests/canvText.test b/tests/canvText.test
index f0c677f..094bfa2 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -873,6 +873,7 @@ test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} -setup {
     .c find enclosed 99 99 [expr $x2 + 1] [expr $y2 + 1]
 } -cleanup {
     destroy .c
+    unset -nocomplain bbox x2 y2
 } -result 1
 
 test canvText-19.1 {patch 1006286, leading space caused wrap under Win32} -setup {
diff --git a/tests/scale.test b/tests/scale.test
index 32ce1ff..a8d08a8 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -1366,6 +1366,7 @@ test scale-19 {Bug [3529885fff] - Click in through goes in wrong direction} \
     -setup {
         catch {destroy .s}
         catch {destroy .s1 .s2 .s3 .s4}
+        unset -nocomplain x1 x2 x3 x4 x y
         scale .s1 -from 0 -to 100 -resolution 1  -variable x1 -digits 4 -orient horizontal -length 100
         scale .s2 -from 0 -to 100 -resolution -1 -variable x2 -digits 4 -orient horizontal -length 100
         scale .s3 -from 100 -to 0 -resolution 1  -variable x3 -digits 4 -orient horizontal -length 100