Merge 8.6 (and fix merge conflict arising from that)

3 files changed, 4 insertions, 4 deletions

diff --git a/tests/bind.test b/tests/bind.test
index e4d1f1b..46856c9 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -5920,7 +5920,7 @@ test bind-28.8 {keysym names} -setup {
 } -result {X x {keysym X}}
 
 
-test bind-29.1 {Tk_BackgroundError procedure} -setup {
+test bind-29.1 {Tcl_BackgroundError procedure} -setup {
     proc bgerror msg {
         global x errorInfo
         set x [list $msg $errorInfo]
@@ -5944,7 +5944,7 @@ test bind-29.1 {Tk_BackgroundError procedure} -setup {
 "error "This is a test""
     (command bound to event)}}
     
-test bind-29.2 {Tk_BackgroundError procedure} -setup {
+test bind-29.2 {Tcl_BackgroundError procedure} -setup {
     proc do {} {
         event generate .t.f <Button>
         event generate .t.f <ButtonRelease>
diff --git a/tests/menuDraw.test b/tests/menuDraw.test
index 1dfa5d7..0d7a049 100644
--- a/tests/menuDraw.test
+++ b/tests/menuDraw.test
@@ -20,7 +20,7 @@ test menuDraw-1.1 {TkMenuInitializeDrawingFields} -setup {
 } -result {.m1}
 
 
-test menuDraw-2.1 {TkIntializeMenuEntryDrawingFields} -setup {
+test menuDraw-2.1 {TkInitializeMenuEntryDrawingFields} -setup {
     deleteWindows
 } -body {
     menu .m1
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index c2dc073..7d26fbf 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -341,7 +341,7 @@ test unixEmbed-2.4 {EmbeddedEventProc procedure} -constraints {
 
 
 test unixEmbed-3.1 {ContainerEventProc procedure, detect creation} -constraints {
-    unix testembed notPortable
+    unix testembed nonPortable
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1