Reduce differences in the test suite between 8.6 and 8.7 by backporting cosmetic differences from 8.7.

1 files changed, 132 insertions, 135 deletions

diff --git a/tests/text.test b/tests/text.test
index 43810cd..b238886 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -28,7 +28,7 @@ test text-1.1 {configuration option: "autoseparators"} -setup {
     .t cget -autoseparators
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.1b {configuration option: "autoseparators", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -37,7 +37,7 @@ test text-1.1b {configuration option: "autoseparators", default} -setup {
     .t cget -autoseparators
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.2 {configuration option: "autoseparators"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -75,7 +75,7 @@ test text-1.5 {configuration option: "bd"} -setup {
     .t cget -bd
 } -cleanup {
     destroy .t
-} -result {4}
+} -result 4
 test text-1.6 {configuration option: "bd"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -113,7 +113,7 @@ test text-1.9 {configuration option: "blockcursor"} -setup {
     .t cget -blockcursor
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.10 {configuration option: "blockcursor"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -132,7 +132,7 @@ test text-1.11 {configuration option: "borderwidth"} -setup {
     .t cget -borderwidth
 } -cleanup {
     destroy .t
-} -result {7}
+} -result 7
 test text-1.12 {configuration option: "borderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -170,7 +170,7 @@ test text-1.15 {configuration option: "exportselection"} -setup {
     .t cget -exportselection
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.16 {configuration option: "exportselection"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -246,7 +246,7 @@ test text-1.23 {configuration option: "height"} -setup {
     .t cget -height
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.24 {configuration option: "height"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -303,7 +303,7 @@ test text-1.29 {configuration option: "highlightthickness"} -setup {
     .t cget -highlightthickness
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.30 {configuration option: "highlightthickness"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -360,7 +360,7 @@ test text-1.35 {configuration option: "insertborderwidth"} -setup {
     .t cget -insertborderwidth
 } -cleanup {
     destroy .t
-} -result {45}
+} -result 45
 test text-1.36 {configuration option: "insertborderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -379,7 +379,7 @@ test text-1.37 {configuration option: "insertofftime"} -setup {
     .t cget -insertofftime
 } -cleanup {
     destroy .t
-} -result {100}
+} -result 100
 test text-1.38 {configuration option: "insertofftime"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -398,7 +398,7 @@ test text-1.39 {configuration option: "insertontime"} -setup {
     .t cget -insertontime
 } -cleanup {
     destroy .t
-} -result {47}
+} -result 47
 test text-1.40 {configuration option: "insertontime"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -417,7 +417,7 @@ test text-1.41 {configuration option: "insertwidth"} -setup {
     .t cget -insertwidth
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-1.42 {configuration option: "insertwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -436,7 +436,7 @@ test text-1.43 {configuration option: "maxundo"} -setup {
     .t cget -maxundo
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.43b {configuration option: "maxundo", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -445,7 +445,7 @@ test text-1.43b {configuration option: "maxundo", default} -setup {
     .t cget -maxundo
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.44 {configuration option: "maxundo"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -464,7 +464,7 @@ test text-1.45 {configuration option: "padx"} -setup {
     .t cget -padx
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-1.46 {configuration option: "padx"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -483,7 +483,7 @@ test text-1.47 {configuration option: "pady"} -setup {
     .t cget -pady
 } -cleanup {
     destroy .t
-} -result {82}
+} -result 82
 test text-1.48 {configuration option: "pady"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -540,7 +540,7 @@ test text-1.53 {configuration option: "selectborderwidth"} -setup {
     .t cget -selectborderwidth
 } -cleanup {
     destroy .t
-} -result {21}
+} -result 21
 test text-1.54 {configuration option: "selectborderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -578,7 +578,7 @@ test text-1.57 {configuration option: "spacing1"} -setup {
     .t cget -spacing1
 } -cleanup {
     destroy .t
-} -result {20}
+} -result 20
 test text-1.58 {configuration option: "spacing1"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -597,7 +597,7 @@ test text-1.59 {configuration option: "spacing1"} -setup {
     .t cget -spacing1
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.60 {configuration option: "spacing1"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -616,7 +616,7 @@ test text-1.61 {configuration option: "spacing2"} -setup {
     .t cget -spacing2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.62 {configuration option: "spacing2"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -635,7 +635,7 @@ test text-1.63 {configuration option: "spacing2"} -setup {
     .t cget -spacing2
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.64 {configuration option: "spacing2"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -654,7 +654,7 @@ test text-1.65 {configuration option: "spacing3"} -setup {
     .t cget -spacing3
 } -cleanup {
     destroy .t
-} -result {20}
+} -result 20
 test text-1.66 {configuration option: "spacing3"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -673,7 +673,7 @@ test text-1.67 {configuration option: "spacing3"} -setup {
     .t cget -spacing3
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.68 {configuration option: "spacing3"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -749,7 +749,7 @@ test text-1.75 {configuration option: "undo"} -setup {
     .t cget -undo
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.75b {configuration option: "undo", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -758,7 +758,7 @@ test text-1.75b {configuration option: "undo", default} -setup {
     .t cget -undo
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.76 {configuration option: "undo"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -777,7 +777,7 @@ test text-1.77 {configuration option: "width"} -setup {
     .t cget -width
 } -cleanup {
     destroy .t
-} -result {73}
+} -result 73
 test text-1.78 {configuration option: "width"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -1004,7 +1004,7 @@ test text-5.4 {TextWidgetCmd procedure, "cget" option} -setup {
     .t cget -bd
 } -cleanup {
     destroy .t
-} -result {17}
+} -result 17
 
 
 test text-6.1 {TextWidgetCmd procedure, "compare" option} -setup {
@@ -1198,7 +1198,7 @@ test text-7.3 {TextWidgetCmd procedure, "debug" option} -setup {
     .t deb
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-7.4 {TextWidgetCmd procedure, "debug" option} -setup {
     text .t
 } -body {
@@ -1206,7 +1206,7 @@ test text-7.4 {TextWidgetCmd procedure, "debug" option} -setup {
     .t debug
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 
 
 test text-8.1 {TextWidgetCmd procedure, "delete" option} -setup {
@@ -1252,7 +1252,7 @@ bOy GIrl .#@? x_yz
 Line 7"
     .t configure -state disabled
     .t delete 2.3
-    .t g 2.0 2.end
+    .t get 2.0 2.end
 } -cleanup {
     destroy .t
 } -result {abcdefghijklm}
@@ -1458,7 +1458,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.22 {TextWidgetCmd procedure, "replace" option with undo} -setup {
     text .t
     set res {}
@@ -1502,14 +1502,14 @@ Line 7"
     # Ensure that undo (even composite undo like 'replace')
     # works when the widget shows nothing useful.
     .t replace 2.1 2.3 foo
-    .t configure -start 1 -end 1
+    .t configure -startline 1 -endline 1
     .t edit undo
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     .t configure -undo 0
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.24 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
     text .t
 } -body {
@@ -1528,15 +1528,15 @@ Line 7"
 # works when the the event took place in one peer, which
 # is then deleted, before the undo takes place in another peer.
     .tt replace 2.1 2.3 foo
-    .tt configure -start 1 -end 1
+    .tt configure -startline 1 -endline 1
     destroy .tt
     .t edit undo
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     .t configure -undo 0
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.25 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
     text .t
 } -body {
@@ -1557,14 +1557,14 @@ Line 7"
 # which isn't showing everything.
     .tt replace 2.1 2.3 foo
     set res [.tt get 2.1 2.4]
-    .tt configure -start 1 -end 1
+    .tt configure -startline 1 -endline 1
     destroy .tt
-    .t configure -start 3 -end 4
+    .t configure -startline 3 -endline 4
 # msg will actually be set to a silently ignored error message here,
 # (that the .tt command doesn't exist), but that is not important.
     lappend res [catch {.t edit undo}]
     .t configure -undo 0
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     lappend res [string equal [.t get 1.0 end-1c] $prevtext]
 } -cleanup {
     destroy .t
@@ -2091,7 +2091,7 @@ Line 7"
     .t count 5.7 5.3
 } -cleanup {
     destroy .t
-} -result {-4}
+} -result -4
 test text-10.7 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2105,7 +2105,7 @@ Line 7"
     .t count 5.3 5.5
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.8 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2119,7 +2119,7 @@ Line 7"
     .t count 5.3 end
 } -cleanup {
     destroy .t
-} -result {29}
+} -result 29
 test text-10.9 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2133,7 +2133,7 @@ Line 7"
     .t count 5.2 5.7
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.10 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2147,7 +2147,7 @@ Line 7"
     .t count 5.2 5.3
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.11 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2161,7 +2161,7 @@ Line 7"
     .t count 5.2 5.4
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.12 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2191,7 +2191,7 @@ Line 7"
     .t count -displayindices 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.14 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2207,7 +2207,7 @@ Line 7"
     .t count -displayindices 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.15 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2224,7 +2224,7 @@ Line 7"
     .t count -displayindices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.16 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2247,7 +2247,7 @@ Line 7"
     .t count -displayindices 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.17 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2270,7 +2270,7 @@ Line 7"
     .t count -displayindices 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.18 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2295,7 +2295,7 @@ Line 7"
     .t count -displayindices a 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.19 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2319,7 +2319,7 @@ Line 7"
     .t count -displayindices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {6}
+} -result 6
 test text-10.20 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2343,7 +2343,7 @@ Line 7"
     .t count -displaychars 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.21 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2367,7 +2367,7 @@ Line 7"
     .t count -displaychars 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.22 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2392,7 +2392,7 @@ Line 7"
     .t count -displaychars a 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.23 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2416,7 +2416,7 @@ Line 7"
     .t count -displaychars 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.24 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2491,7 +2491,7 @@ Line 7"
     .t count -indices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {21}
+} -result 21
 test text-10.27 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2516,7 +2516,7 @@ Line 7"
     .t count -chars 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {10}
+} -result 10
 test text-10.28 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2541,7 +2541,7 @@ Line 7"
     .t count -chars a 3.0
 } -cleanup {
     destroy .t
-} -result {9}
+} -result 9
 test text-10.29 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2566,7 +2566,7 @@ Line 7"
     .t count -chars 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {19}
+} -result 19
 test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2576,7 +2576,7 @@ test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.0 end
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.31 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2586,7 +2586,7 @@ test text-10.31 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines end 1.0
 } -cleanup {
     destroy .t
-} -result {-3}
+} -result -3
 test text-10.32 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2606,7 +2606,7 @@ test text-10.33 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines end end
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.34 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2616,7 +2616,7 @@ test text-10.34 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.5 2.5
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.35 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2626,7 +2626,7 @@ test text-10.35 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 2.5 "2.5 lineend"
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.36 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2636,7 +2636,7 @@ test text-10.36 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 2.7 "1.0 lineend"
 } -cleanup {
     destroy .t
-} -result {-1}
+} -result -1
 test text-10.37 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2647,7 +2647,7 @@ test text-10.37 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -displaylines 1.0 end
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.38 {TextWidgetCmd procedure, "count" option} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .t -expand 1 -fill both
@@ -2679,7 +2679,7 @@ test text-10.39 {TextWidgetCmd procedure, "count" option} -setup {
 } -cleanup {
     destroy .t
 } -result {2 6 1 5}
-test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
+test text-10.40 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     pack .t
     update
@@ -2694,8 +2694,8 @@ test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
     set res [.t count -displaylines 2.0 3.0]
 } -cleanup {
     destroy .t
-} -result {0}
-test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
+} -result 0
+test text-10.41 {TextWidgetCmd procedure, "count" option} -setup {
     toplevel .mytop
     pack [text .mytop.t -font TkFixedFont -bd 0 -padx 0 -wrap char]
     set spec [font measure TkFixedFont "Line 1+++Line 1---Li"]  ; # 20 chars
@@ -2717,7 +2717,7 @@ test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
 } -cleanup {
     destroy .mytop
 } -result {1 3}
-test text-9.2.47 {TextWidgetCmd procedure, "count" option} -setup {
+test text-10.42 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     pack .t
     update
@@ -2771,7 +2771,7 @@ test text-11.2 {counting with tag priority eliding} -setup {
     .t count -displaychars 1.0 1.5
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-11.3 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
@@ -2784,7 +2784,7 @@ test text-11.3 {counting with tag priority eliding} -setup {
     .t count -displaychars 1.0 1.5
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-11.4 {counting with tag priority eliding}  -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
     set res {}
@@ -3414,7 +3414,7 @@ test text-14.14 {ConfigureText procedure} -body {
     selection get
 } -cleanup {
     destroy .t .t2
-} -result {1234}
+} -result 1234
 test text-14.15 {ConfigureText procedure} -body {
     text .t
     entry .t.e
@@ -3428,7 +3428,7 @@ test text-14.15 {ConfigureText procedure} -body {
     selection get
 } -cleanup {
     destroy .t2 .t
-} -result {1234}
+} -result 1234
 test text-14.16 {ConfigureText procedure} -body {
     text .t
     entry .t.e
@@ -3457,7 +3457,7 @@ test text-14.17 {ConfigureText procedure} -body {
     return $result
 } -cleanup {
     destroy .t .t2
-} -result {1234}
+} -result 1234
 test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
@@ -3960,7 +3960,7 @@ test text-20.5 {TextFetchSelection procedure, long selections} -setup {
     expr {[selection get] eq "$x\n"}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
@@ -6447,7 +6447,7 @@ test text-25.1 {text widget vs hidden commands} -body {
     destroy .t
     set x [list [winfo children .] [interp hidden]]
     expr {$x eq $y}
-} -result {1}
+} -result 1
 
 
 test text-26.1 {bug fix - 1642} -body {
@@ -6540,7 +6540,7 @@ test text-27.8 {TextEditCmd procedure, modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-27.9 {TextEditCmd procedure, reset modified flag} -body {
     text .t
     pack .t
@@ -6549,7 +6549,7 @@ test text-27.9 {TextEditCmd procedure, reset modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-27.10 {TextEditCmd procedure, set modified flag} -body {
     text .t
     pack .t
@@ -6557,7 +6557,7 @@ test text-27.10 {TextEditCmd procedure, set modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-27.11 {TextEditCmd procedure, set modified flag repeat} -setup {
     text .t
     pack .t
@@ -6627,7 +6627,7 @@ test text-27.14a {<<Modified>> virtual event - propagation to peers} -body {
     set ::retval
 } -cleanup {
     destroy .t .tt
-} -result {4}
+} -result 4
 test text-27.15 {<<Selection>> virtual event on sel tagging} -body {
     set ::retval no_selection
     pack [text .t]
@@ -6746,7 +6746,7 @@ test text-27.15g {No <<Selection>> virtual event on <<Cut>> without widget selec
     destroy .t
 } -result {no_<<Selection>>_event_fired}
 test text-27.16 {-maxundo configuration option} -body {
-    text .t -undo 1  -autoseparators 1 -maxundo 2
+    text .t -undo 1 -autoseparators 1 -maxundo 2
     pack .t
     .t insert end "line 1\n"
     .t delete 1.4 1.6
@@ -6979,13 +6979,13 @@ test text-28.1 {bug fix - 624372, ControlUtfProc long lines} -body {
 
 test text-29.1 {tabs - must be positive and must be increasing} -body {
     pack [text .t -wrap none]
-    .t configure -tabs {0}
+    .t configure -tabs 0
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {tab stop "0" is not at a positive distance}
 test text-29.2 {tabs - must be positive and must be increasing} -body {
     pack [text .t -wrap none]
-    .t configure -tabs {-5}
+    .t configure -tabs -5
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {tab stop "-5" is not at a positive distance}
@@ -7008,7 +7008,7 @@ test text-29.4 {tabs - must be positive and must be increasing} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-30.1 {repeated insert and scroll} -body {
@@ -7021,7 +7021,7 @@ test text-30.1 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.2 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7032,7 +7032,7 @@ test text-30.2 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.3 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7043,7 +7043,7 @@ test text-30.3 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.4 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7054,7 +7054,7 @@ test text-30.4 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-31.1 {peer widgets} -body {
@@ -7099,7 +7099,7 @@ test text-31.4 {peer widgets} -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
+    pack [.t peer create .top.t -startline 5 -endline 11]
     update
     destroy .t .top
 } -result {}
@@ -7109,7 +7109,7 @@ test text-31.5 {peer widgets} -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
+    pack [.t peer create .top.t -startline 5 -endline 11]
     pack [.top.t peer create .top.t2]
     set res [list [.top.t index end] [.top.t2 index end]]
     update
@@ -7123,8 +7123,8 @@ test text-31.6 {peer widgets} -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
-    pack [.top.t peer create .top.t2 -start {} -end {}]
+    pack [.t peer create .top.t -startline 5 -endline 11]
+    pack [.top.t peer create .top.t2 -startline {} -endline {}]
     set res [list [.top.t index end] [.top.t2 index end]]
     update
     return $res
@@ -7137,21 +7137,21 @@ test text-31.7 {peer widgets} -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
+    pack [.t peer create .top.t -startline 5 -endline 11]
     update ; update
     set p1 [.top.t count -update -ypixels 1.0 end]
     set p2 [.t count -update -ypixels 5.0 11.0]
     expr {$p1 eq $p2}
 } -cleanup {
     destroy .t .top
-} -result {1}
+} -result 1
 test text-31.8 {peer widgets} -body {
     toplevel .top
     pack [text .t]
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
+    pack [.t peer create .top.t -startline 5 -endline 11]
     update ; update
     .t delete 3.0 6.0
     .top.t index end
@@ -7164,7 +7164,7 @@ test text-31.9 {peer widgets} -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
+    pack [.t peer create .top.t -startline 5 -endline 11]
     update ; update
     .t delete 8.0 12.0
     .top.t index end
@@ -7177,7 +7177,7 @@ test text-31.10 {peer widgets} -body {
         for {set i 1} {$i < 20} {incr i} {
         .t insert end "Line $i\n"
     }
-    pack [.t peer create .top.t -start 5 -end 11]
+    pack [.t peer create .top.t -startline 5 -endline 11]
     update ; update
     .t delete 3.0 13.0
     .top.t index end
@@ -7193,7 +7193,7 @@ test text-31.11 {peer widgets} -setup {
     }
     .t tag add sel 1.0 end-1c
     lappend res [.t tag ranges sel]
-    .t configure -start 10 -end 20
+    .t configure -startline 10 -endline 20
     lappend res [.t tag ranges sel]
     return $res
 } -cleanup {
@@ -7208,7 +7208,7 @@ test text-31.12 {peer widgets} -setup {
     }
     .t tag add sel 1.0 end-1c
     lappend res [.t tag ranges sel]
-    .t configure -start 11
+    .t configure -startline 11
     lappend res [.t tag ranges sel]
     return $res
 } -cleanup {
@@ -7223,7 +7223,7 @@ test text-31.13 {peer widgets} -setup {
     }
     .t tag add sel 1.0 end-1c
     lappend res [.t tag ranges sel]
-    .t configure -end 90
+    .t configure -endline 90
     lappend res [.t tag ranges sel]
     destroy .t
     return $res
@@ -7239,7 +7239,7 @@ test text-31.14 {peer widgets} -setup {
     }
     .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     lappend res [.t tag prevrange sel 1.0]
-    .t configure -start 6 -end 12
+    .t configure -startline 6 -endline 12
     lappend res [.t tag ranges sel]
     lappend res "next" [.t tag nextrange sel 4.0] \
       [.t tag nextrange sel 5.0] [.t tag nextrange sel 6.0] \
@@ -7259,7 +7259,7 @@ test text-31.15 {peer widgets} -setup {
 	   .t insert end "Line $i\n"
     }
     .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0
-    .t configure -start 6 -end 12
+    .t configure -startline 6 -endline 12
     lappend res [.t tag ranges sel]
     lappend res "next" [.t tag nextrange sel 4.0] \
       [.t tag nextrange sel 5.0] [.t tag nextrange sel 6.0] \
@@ -7279,7 +7279,7 @@ test text-31.16 {peer widgets} -setup {
 	.t insert end "Line $i\n"
     }
     .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
-    .t configure -start 6 -end 12
+    .t configure -startline 6 -endline 12
     lappend res [.t tag ranges sel]
     lappend res "next" [.t tag nextrange sel 4.0] \
       [.t tag nextrange sel 5.0] [.t tag nextrange sel 6.0] \
@@ -7300,11 +7300,11 @@ test text-31.17 {peer widgets} -setup {
     }
     .t tag add sel 1.0 11.0
     lappend res [.t tag ranges sel]
-    lappend res [catch {.t configure -start 15 -end 10}]
+    lappend res [catch {.t configure -startline 15 -endline 10}]
     lappend res [.t tag ranges sel]
-    .t configure -start 6 -end 12
+    .t configure -startline 6 -endline 12
     lappend res [.t tag ranges sel]
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     lappend res [.t tag ranges sel]
     return $res
 } -cleanup {
@@ -7371,9 +7371,9 @@ test text-32.1 {line heights on creation} -setup {
     expr {$before eq $after}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
-test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
+test text-32.2 {peer widget -start, -endline and deletion (bug 1630262)} -setup {
     destroy .t .pt
     set res {}
 } -body {
@@ -7401,9 +7401,9 @@ test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     set res 1
 } -cleanup {
     destroy .pt
-} -result {1}
+} -result 1
 
-test text-32.3 {peer widget -start, -end and deletion (bug 1630262)} -setup {
+test text-32.3 {peer widget -start, -endline and deletion (bug 1630262)} -setup {
     destroy .t .pt
     set res {}
 } -body {
@@ -7424,7 +7424,7 @@ test text-32.3 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .pt
 } -result {4 3 {Line 5}}
 
-test text-32.4 {peer widget -start, -end and deletion (bug 1630262)} -setup {
+test text-32.4 {peer widget -start, -endline and deletion (bug 1630262)} -setup {
     destroy .t .pt
     set res {}
 } -body {
@@ -7485,7 +7485,7 @@ test text-33.2 {TextWidgetCmd procedure, "peer" option} -setup {
 test text-33.3 {TextWidgetCmd procedure, "peer" option} -setup {
     text .t
 } -body {
-    .t pee names
+    .t peer names
 } -cleanup {
     destroy .t
 } -returnCodes {ok} -result {}
@@ -7517,17 +7517,17 @@ test text-33.6 {TextWidgetCmd procedure, "peer" option} -setup {
 } -result {.t2 .t {}}
 test text-33.7 {peer widget -start, -end} -body {
     text .t
-    set res [.t configure -start 10 -end 5]
+    set res [.t configure -startline 10 -endline 5]
     return $res
 } -cleanup {
     destroy .t
-} -returnCodes {2} -result {}
+} -returnCodes 2 -result {}
 test text-33.8 {peer widget -start, -end} -body {
     text .t
     for {set i 1} {$i < 100} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    .t configure -start 10 -end 5
+    .t configure -startline 10 -endline 5
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {-startline must be less than or equal to -endline}
@@ -7536,7 +7536,7 @@ test text-33.9 {peer widget -start, -end} -body {
     for {set i 1} {$i < 100} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t configure -start 5 -end 10
+    .t configure -startline 5 -endline 10
 } -cleanup {
     destroy .t
 } -returnCodes {ok} -result {}
@@ -7546,11 +7546,11 @@ test text-33.10 {peer widget -start, -end} -body {
 	   .t insert end "Line $i\n"
     }
     set res [.t index end]
-    lappend res [catch {.t configure -start 5 -end 10 -tab foo}]
+    lappend res [catch {.t configure -startline 5 -endline 10 -tab foo}]
     lappend res [.t index end]
-    lappend res [catch {.t configure -tab foo -start 15 -end 20}]
+    lappend res [catch {.t configure -tab foo -startline 15 -endline 20}]
     lappend res [.t index end]
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     lappend res [.t index end]
     return $res
 } -cleanup {
@@ -7562,18 +7562,18 @@ test text-33.11 {peer widget -start, -end} -body {
 	   .t insert end "Line $i\n"
     }
     set res [.t index end]
-    lappend res [catch {.t configure -start 5 -end 15}]
+    lappend res [catch {.t configure -startline 5 -endline 15}]
     lappend res [.t index end]
-    lappend res [catch {.t configure -start 10 -end 40}]
+    lappend res [catch {.t configure -startline 10 -endline 40}]
     lappend res [.t index end]
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     lappend res [.t index end]
     return $res
 } -cleanup {
     destroy .t
 } -result {101.0 0 11.0 0 31.0 101.0}
 
-test text-34.1 {peer widget -start, -end and selection} -setup {
+test text-34.1 {peer widget -start, -endline and selection} -setup {
     text .t
     set res {}
 } -body {
@@ -7582,17 +7582,17 @@ test text-34.1 {peer widget -start, -end and selection} -setup {
     }
     .t tag add sel 10.0 20.0
     lappend res [.t tag ranges sel]
-    .t configure -start 5 -end 30
+    .t configure -startline 5 -endline 30
     lappend res [.t tag ranges sel]
-    .t configure -start 5 -end 15
+    .t configure -startline 5 -endline 15
     lappend res [.t tag ranges sel]
-    .t configure -start 15 -end 30
+    .t configure -startline 15 -endline 30
     lappend res [.t tag ranges sel]
-    .t configure -start 15 -end 16
+    .t configure -startline 15 -endline 16
     lappend res [.t tag ranges sel]
-    .t configure -start 25 -end 30
+    .t configure -startline 25 -endline 30
     lappend res [.t tag ranges sel]
-    .t configure -start {} -end {}
+    .t configure -startline {} -endline {}
     lappend res [.t tag ranges sel]
     return $res
 } -cleanup {
@@ -7601,7 +7601,6 @@ test text-34.1 {peer widget -start, -end and selection} -setup {
 
 test text-35.1 {widget dump -command alters tags} -setup {
      proc Dumpy {key value index} {
-#puts "KK: $key, $value"
       .t tag add $value [list $index linestart] [list $index lineend]
     }
     text .t
@@ -7615,7 +7614,6 @@ test text-35.1 {widget dump -command alters tags} -setup {
 } -result {ok}
 test text-35.2 {widget dump -command makes massive changes} -setup {
     proc Dumpy {key value index} {
-#puts "KK: $key, $value"
       .t delete 1.0 end
     }
     text .t
@@ -7629,7 +7627,6 @@ test text-35.2 {widget dump -command makes massive changes} -setup {
 } -result {ok}
 test text-35.3 {widget dump -command destroys widget} -setup {
     proc Dumpy {key value index} {
-#puts "KK: $key, $value"
         destroy .t
     }
     text .t