Purged Tcl_AppendElement from all non-test code.

1 files changed, 220 insertions, 391 deletions

diff --git a/tests/grid.test b/tests/grid.test
index 0f0feeb..6b2dfe3 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -1,5 +1,5 @@
-# This file is a Tcl script to test out the *NEW* "grid" command
-# of Tk.  It is (almost) organized in the standard fashion for Tcl tests.
+# This file is a Tcl script to test out the *NEW* "grid" command of Tk. It is
+# (almost) organized in the standard fashion for Tcl tests.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
@@ -10,15 +10,14 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
-
-# helper routine to return "." to a sane state after a test
-# The variable GRID_VERBOSE can be used to "look" at the result
-# of one or all of the tests
+# helper routine to return "." to a sane state after a test.
+# The variable GRID_VERBOSE can be used to "look" at the result of one or all
+# of the tests
 
 proc grid_reset {{test ?} {top .}} {
     global GRID_VERBOSE
     if {[info exists GRID_VERBOSE]} {
-	if {$GRID_VERBOSE=="" || $GRID_VERBOSE==$test} {
+	if {$GRID_VERBOSE eq "" || $GRID_VERBOSE eq $test} {
 	    puts -nonewline "grid test $test: "
 	    flush stdout
 	    gets stdin
@@ -28,10 +27,10 @@ proc grid_reset {{test ?} {top .}} {
     update
     foreach {cols rows} [grid size .] {}
     for {set i 0} {$i <= $cols} {incr i} {
-    	grid columnconfigure . $i -weight 0 -minsize 0 -pad 0 -uniform ""
+	grid columnconfigure . $i -weight 0 -minsize 0 -pad 0 -uniform ""
     }
     for {set i 0} {$i <= $rows} {incr i} {
-    	grid rowconfigure . $i -weight 0 -minsize 0 -pad 0 -uniform ""
+	grid rowconfigure . $i -weight 0 -minsize 0 -pad 0 -uniform ""
     }
     grid propagate . 1
     grid anchor . nw
@@ -40,77 +39,74 @@ proc grid_reset {{test ?} {top .}} {
 
 grid_reset 0.0
 wm geometry . {}
-
+
 test grid-1.1 {basic argument checking} -body {
-	grid
+    grid
 } -returnCodes error -result {wrong # args: should be "grid option arg ?arg ...?"}
 test grid-1.2 {basic argument checking} -body {
-	grid foo bar
+    grid foo bar
 } -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
 test grid-1.3 {basic argument checking} -body {
-	button .b
-	grid .b -row 0 -column
+    button .b
+    grid .b -row 0 -column
 } -cleanup {
     grid_reset 1.3
 } -returnCodes error -result {extra option or option with no value}
-
 test grid-1.4 {basic argument checking} -body {
-	button .b
-	grid configure .b - foo
+    button .b
+    grid configure .b - foo
 } -cleanup {
     grid_reset 1.4
 } -returnCodes error -result {unexpected parameter "foo" in configure list: should be window name or option}
 test grid-1.5 {basic argument checking} -body {
-	grid .
+    grid .
 } -returnCodes error -result {can't manage ".": it's a top-level window}
 test grid-1.6 {basic argument checking} -body {
-	grid x
+    grid x
 } -returnCodes error -result {can't determine master window}
 test grid-1.7 {basic argument checking} -body {
-	grid configure x
+    grid configure x
 } -returnCodes error -result {can't determine master window}
 test grid-1.8 {basic argument checking} -body {
-	button .b
-	grid x .b
+    button .b
+    grid x .b
 } -cleanup {
     grid_reset 1.8
 } -returnCodes ok -result {}
-
 test grid-1.9 {basic argument checking} -body {
-	button .b
-	grid configure x .b
+    button .b
+    grid configure x .b
 } -cleanup {
     grid_reset 1.9
 } -returnCodes ok -result {}
 
-
 test grid-2.1 {bbox} -body {
-	grid bbox .
+    grid bbox .
 } -result {0 0 0 0}
 test grid-2.2 {bbox} -body {
-	button .b
-	grid .b
-	destroy .b
-	update
-	grid bbox .
+    button .b
+    grid .b
+    destroy .b
+    update
+    grid bbox .
 } -result {0 0 0 0}
 test grid-2.3 {bbox: argument checking} -body {
-	grid bbox . 0 0 5
+    grid bbox . 0 0 5
 } -returnCodes error -result {wrong # args: should be "grid bbox master ?column row ?column row??"}
 test grid-2.4 {bbox} -body {
-	grid bbox .bad 0 0
+    grid bbox .bad 0 0
 } -returnCodes error -result {bad window path name ".bad"}
 test grid-2.5 {bbox} -body {
-	grid bbox . x 0
+    grid bbox . x 0
 } -returnCodes error -result {expected integer but got "x"}
 test grid-2.6 {bbox} -body {
-	grid bbox . 0 x
+    grid bbox . 0 x
 } -returnCodes error -result {expected integer but got "x"}
 test grid-2.7 {bbox} -body {
-	grid bbox . 0 0 x 0
+    grid bbox . 0 0 x 0
 } -returnCodes error -result {expected integer but got "x"}
 test grid-2.8 {bbox} -body {
-	grid bbox . 0 0 0 x
+    grid bbox . 0 0 0 x
 } -returnCodes error -result {expected integer but got "x"}
 test grid-2.9 {bbox} -body {
     frame .1 -width 75 -height 75 -bg red
@@ -123,11 +119,10 @@ test grid-2.9 {bbox} -body {
     lappend a [grid bbox . 0 0]
     lappend a [grid bbox . 0 0 1 1]
     lappend a [grid bbox . 1 1]
-    set a
+    return $a
 } -cleanup {
     grid_reset 2.9
 } -result {{0 0 165 165} {0 0 75 75} {0 0 165 165} {75 75 90 90}}
-
 test grid-2.10 {bbox} -body {
     frame .1 -width 75 -height 75 -bg red
     frame .2 -width 90 -height 90 -bg red
@@ -138,12 +133,11 @@ test grid-2.10 {bbox} -body {
     lappend a [grid bbox . 10 10 0 0]
     lappend a [grid bbox . -2 -2 -1 -1]
     lappend a [grid bbox . 10 10 12 12]
-    set a
+    return $a
 } -cleanup {
     grid_reset 2.10
 } -result {{0 0 165 165} {0 0 0 0} {165 165 0 0}}
 
-
 test grid-3.1 {configure: basic argument checking} -body {
     grid configure foo
 } -returnCodes error -result {bad argument "foo": must be name of window}
@@ -154,35 +148,30 @@ test grid-3.2 {configure: basic argument checking} -body {
 } -cleanup {
     grid_reset 3.2
 } -result {.b}
-
 test grid-3.3 {configure: basic argument checking} -body {
     button .b
     grid .b -row -1
 } -cleanup {
     grid_reset 3.3
 } -returnCodes error -result {bad row value "-1": must be a non-negative integer}
-
 test grid-3.4 {configure: basic argument checking} -body {
     button .b
     grid .b -column -1
 } -cleanup {
     grid_reset 3.4
 } -returnCodes error -result {bad column value "-1": must be a non-negative integer}
-
 test grid-3.5 {configure: basic argument checking} -body {
     button .b
     grid .b -rowspan 0
 } -cleanup {
     grid_reset 3.5
 } -returnCodes error -result {bad rowspan value "0": must be a positive integer}
-
 test grid-3.6 {configure: basic argument checking} -body {
     button .b
     grid .b -columnspan 0
 } -cleanup {
     grid_reset 3.6
 } -returnCodes error -result {bad columnspan value "0": must be a positive integer}
-
 test grid-3.7 {configure: basic argument checking} -body {
     frame .f
     button .f.b
@@ -190,7 +179,6 @@ test grid-3.7 {configure: basic argument checking} -body {
 } -cleanup {
     grid_reset 3.7
 } -returnCodes error -result {can't put .f.b inside .}
-
 test grid-3.8 {configure: basic argument checking} -body {
     button .b
     grid configure x .b
@@ -198,7 +186,6 @@ test grid-3.8 {configure: basic argument checking} -body {
 } -cleanup {
     grid_reset 3.8
 } -result {.b}
-
 test grid-3.9 {configure: basic argument checking} -body {
     button .b
     grid configure y .b
@@ -206,7 +193,6 @@ test grid-3.9 {configure: basic argument checking} -body {
     grid_reset 3.9
 } -returnCodes error -result {invalid window shortcut, "y" should be '-', 'x', or '^'}
 
-
 test grid-4.1 {forget: basic argument checking} -body {
     grid forget foo
 } -returnCodes error -result {bad window path name "foo"}
@@ -216,11 +202,10 @@ test grid-4.2 {forget} -body {
     set a [grid slaves .]
     grid forget .b .c
     lappend a [grid slaves .]
-    set a
+    return $a
 } -cleanup {
     grid_reset 4.2
 } -result {.b {}}
-
 test grid-4.3 {forget} -body {
     button .c
     grid .c -row 2 -column 2 -rowspan 2 -columnspan 2 -padx 3 -pady 4 -sticky ns
@@ -230,7 +215,6 @@ test grid-4.3 {forget} -body {
 } -cleanup {
     grid_reset 4.3
 } -result {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
-
 test grid-4.4 {forget} -body {
     button .c
     grid .c -row 2 -column 2 -rowspan 2 -columnspan 2 -padx {3 5} -pady {4 7} -sticky ns
@@ -240,7 +224,6 @@ test grid-4.4 {forget} -body {
 } -cleanup {
     grid_reset 4.3.1
 } -result {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
-
 test grid-4.5 {forget, calling Tk_UnmaintainGeometry} -body {
     frame .f -bd 2 -relief raised
     place .f -x 10 -y 20 -width 200 -height 100
@@ -256,9 +239,8 @@ test grid-4.5 {forget, calling Tk_UnmaintainGeometry} -body {
     grid_reset 4.4
 } -result {1 0}
 
-
 test grid-5.1 {info: basic argument checking} -body {
-	grid info a b
+    grid info a b
 } -returnCodes error -result {wrong # args: should be "grid info window"}
 test grid-5.2 {info} -body {
     frame .1 -width 75 -height 75 -bg red
@@ -268,7 +250,6 @@ test grid-5.2 {info} -body {
 } -cleanup {
     grid_reset 5.2
 } -returnCodes error -result {bad window path name ".x"}
-
 test grid-5.3 {info} -body {
     frame .1 -width 75 -height 75 -bg red
     grid .1 -row 0 -column 0
@@ -277,7 +258,6 @@ test grid-5.3 {info} -body {
 } -cleanup {
     grid_reset 5.3
 } -result {-in . -column 0 -row 0 -columnspan 1 -rowspan 1 -ipadx 0 -ipady 0 -padx 0 -pady 0 -sticky {}}
-
 test grid-5.4 {info} -body {
     frame .1 -width 75 -height 75 -bg red
     update
@@ -286,26 +266,24 @@ test grid-5.4 {info} -body {
     grid_reset 5.4
 } -returnCodes ok -result {}
 
-
 test grid-6.1 {location: basic argument checking} -body {
-	grid location .
+    grid location .
 } -returnCodes error -result {wrong # args: should be "grid location master x y"}
 test grid-6.2 {location: basic argument checking} -body {
-	grid location .bad 0 0
+    grid location .bad 0 0
 } -returnCodes error -result {bad window path name ".bad"}
 test grid-6.3 {location: basic argument checking} -body {
-	grid location . x y
+    grid location . x y
 } -returnCodes error -result {bad screen distance "x"}
 test grid-6.4 {location: basic argument checking} -body {
-	grid location . 1c y
+    grid location . 1c y
 } -returnCodes error -result {bad screen distance "y"}
 test grid-6.5 {location: basic argument checking} -body {
-	frame .f
-	grid location .f 10 10
+    frame .f
+    grid location .f 10 10
 } -cleanup {
     grid_reset 6.5
 } -result {-1 -1}
-
 test grid-6.6 {location (x)} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -319,11 +297,10 @@ test grid-6.6 {location (x)} -body {
 	    set got $a
 	}
     }
-    set result
+    return $result
 } -cleanup {
     grid_reset 6.6
 } -result {{-10->-1 0} {0->0 0} {201->1 0}}
-
 test grid-6.7 {location (y)} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -337,11 +314,10 @@ test grid-6.7 {location (y)} -body {
 	    set got $a
 	}
     }
-    set result
+    return $result
 } -cleanup {
     grid_reset 6.7
 } -result {{-10->0 -1} {0->0 0} {101->0 1}}
-
 test grid-6.8 {location (weights)} -body {
     frame .f -width 300 -height 100 -highlightthickness 0 -bg red
     frame .a
@@ -361,56 +337,49 @@ test grid-6.8 {location (weights)} -body {
 	    set got $a
 	}
     }
-    set result
+    return $result
 } -cleanup {
     grid_reset 6.8
 } -result {{-10->-1 -1} {0->0 0} {16->0 1} {201->1 1}}
-
 test grid-6.9 {location: check updates pending} -constraints {
-	nonPortable
+    nonPortable
 } -body {
-	set a ""
-	foreach i {0 1 2} {
-	    frame .$i -width 120 -height 75 -bg red
-	    lappend a [grid location . 150 90]
-	    grid .$i -row $i -column $i
-	}
-	set a
+    set a ""
+    foreach i {0 1 2} {
+	frame .$i -width 120 -height 75 -bg red
+	lappend a [grid location . 150 90]
+	grid .$i -row $i -column $i
+    }
+    return $a
 } -cleanup {
     grid_reset 6.9
 } -result {{0 0} {1 1} {1 1}}
 
-
 test grid-7.1 {propagate} -body {
     grid propagate . 1 xxx
 } -cleanup {
     grid_reset 7.1
 } -returnCodes error -result {wrong # args: should be "grid propagate window ?boolean?"}
-
 test grid-7.2 {propagate} -body {
     grid propagate .
 } -cleanup {
     grid_reset 7.2
 } -result {1}
-
 test grid-7.3 {propagate} -body {
     grid propagate . 0;grid propagate .
 } -cleanup {
     grid_reset 7.3
 } -result {0}
-
 test grid-7.4 {propagate} -body {
     grid propagate .x
 } -cleanup {
     grid_reset 7.4
 } -returnCodes error -result {bad window path name ".x"}
-
 test grid-7.5 {propagate} -body {
     grid propagate . x
 } -cleanup {
     grid_reset 7.5
 } -returnCodes error -result {expected boolean value but got "x"}
-
 test grid-7.6 {propagate} -body {
     frame .f -width 100 -height 100 -bg red
     grid .f -row 0 -column 0
@@ -424,7 +393,7 @@ test grid-7.6 {propagate} -body {
     grid propagate .f 1
     update
     lappend a [winfo width .f]x[winfo height .f]
-    set a
+    return $a
 } -cleanup {
     grid_reset 7.6
 } -result {100x100 100x100 75x85}
@@ -435,31 +404,27 @@ test grid-7.7 {propagate} -body {
     lappend res [grid propagate .]
     grid propagate . 0
     lappend res [grid propagate .]
-    set res
+    return $res
 } -cleanup {
     grid_reset 7.7
 } -result [list 1 0 0]
 
-
 test grid-8.1 {size} -body {
     grid size . foo
 } -cleanup {
     grid_reset 8.1
 } -returnCodes error -result {wrong # args: should be "grid size window"}
-
 test grid-8.2 {size} -body {
     grid size .x
 } -cleanup {
     grid_reset 8.2
 } -returnCodes error -result {bad window path name ".x"}
-
 test grid-8.3 {size} -body {
     frame .f
     grid size .f
 } -cleanup {
     grid_reset 8.3
 } -result {0 0}
-
 test grid-8.4 {size} -body {
     catch {unset a}
     scale .f
@@ -475,11 +440,10 @@ test grid-8.4 {size} -body {
     grid .f -row 0 -column 0
     update
     lappend a [grid size .]
-    set a
+    return $a
 } -cleanup {
     grid_reset 8.4
 } -result {{1 1} {6 5} {664 948} {1 1}}
-
 test grid-8.5 {size} -body {
     catch {unset a}
     scale .f
@@ -496,11 +460,10 @@ test grid-8.5 {size} -body {
     grid rowconfigure . 17 -weight 0
     update
     lappend a [grid size .]
-    set a
+    return $a
 } -cleanup {
     grid_reset 8.5
 } -result {{1 1} {1 18} {64 18} {1 1}}
-
 test grid-8.6 {size} -body {
     catch {unset a}
     scale .f
@@ -523,49 +486,47 @@ test grid-8.6 {size} -body {
     grid columnconfigure . 15 -weight 0
     update
     lappend a [grid size .]
-    set a
+    return $a
 } -cleanup {
     grid_reset 8.6
 } -result {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}}
 
-
 test grid-9.1 {slaves} -body {
-	grid slaves .
+    grid slaves .
 } -returnCodes ok -result {}
 test grid-9.2 {slaves} -body {
-	grid slaves .foo
+    grid slaves .foo
 } -returnCodes error -result {bad window path name ".foo"}
 test grid-9.3 {slaves} -body {
-	grid slaves a b
+    grid slaves a b
 } -returnCodes error -result {wrong # args: should be "grid slaves window ?-option value ...?"}
 test grid-9.4 {slaves} -body {
-	grid slaves . a b
+    grid slaves . a b
 } -returnCodes error -result {bad option "a": must be -column or -row}
 test grid-9.5 {slaves} -body {
-	grid slaves . -column x
+    grid slaves . -column x
 } -returnCodes error -result {expected integer but got "x"}
 test grid-9.6 {slaves} -body {
-	grid slaves . -row -3
+    grid slaves . -row -3
 } -returnCodes error -result {-3 is an invalid value: should NOT be < 0}
 test grid-9.7 {slaves} -body {
-	grid slaves . -foo 3
+    grid slaves . -foo 3
 } -returnCodes error -result {bad option "-foo": must be -column or -row}
 test grid-9.8 {slaves} -body {
-	grid slaves .x -row 3
+    grid slaves .x -row 3
 } -returnCodes error -result {bad window path name ".x"}
 test grid-9.9 {slaves} -body {
-	grid slaves . -row 3
+    grid slaves . -row 3
 } -returnCodes ok -result {}
 test grid-9.10 {slaves} -body {
-	foreach i {0 1 2} {
-	    label .$i -text $i
-	    grid .$i -row $i -column $i
-	}
-	grid slaves .
+    foreach i {0 1 2} {
+	label .$i -text $i
+	grid .$i -row $i -column $i
+    }
+    grid slaves .
 } -cleanup {
     grid_reset 9.10
 } -result {.2 .1 .0}
-
 test grid-9.11 {slaves} -body {
     catch {unset a}
     foreach i {0 1 2} {
@@ -580,168 +541,145 @@ test grid-9.11 {slaves} -body {
     foreach col {0 1 2 3} {
 	lappend a $col{[grid slaves . -column $col]}
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 9.11
 } -result {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}}
 
-
 # column/row configure
 test grid-10.1 {column/row configure} -body {
-	grid columnconfigure .
+    grid columnconfigure .
 } -cleanup {
     grid_reset 10.1
 } -returnCodes error -result {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}
-
 test grid-10.2 {column/row configure} -body {
-	grid columnconfigure . 0 -weight 0 -pad
+    grid columnconfigure . 0 -weight 0 -pad
 } -cleanup {
     grid_reset 10.2
 } -returnCodes error -result {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}
-
 test grid-10.3 {column/row configure} -body {
-	grid columnconfigure .f 0 -weight
+    grid columnconfigure .f 0 -weight
 } -cleanup {
     grid_reset 10.3
 } -returnCodes error -result {bad window path name ".f"}
-
 test grid-10.4 {column/row configure} -body {
-	grid columnconfigure . nine -weight
+    grid columnconfigure . nine -weight
 } -cleanup {
     grid_reset 10.4
-} -returnCodes error -result {expected integer but got "nine" (when retreiving options only integer indices are allowed)}
-
+} -returnCodes error -result {expected integer but got "nine" (when retrieving options only integer indices are allowed)}
 test grid-10.5 {column/row configure} -body {
-	grid columnconfigure . 265 -weight
+    grid columnconfigure . 265 -weight
 } -cleanup {
     grid_reset 10.5
 } -result {0}
-
 test grid-10.6 {column/row configure} -body {
-	grid columnconfigure . 0
+    grid columnconfigure . 0
 } -cleanup {
     grid_reset 10.6
 } -result {-minsize 0 -pad 0 -uniform {} -weight 0}
-
 test grid-10.7 {column/row configure} -body {
-	grid columnconfigure . 0 -foo
+    grid columnconfigure . 0 -foo
 } -cleanup {
     grid_reset 10.7
 } -returnCodes error -result {bad option "-foo": must be -minsize, -pad, -uniform, or -weight}
-
 test grid-10.8 {column/row configure} -body {
-	grid columnconfigure . 0 -minsize foo
+    grid columnconfigure . 0 -minsize foo
 } -cleanup {
     grid_reset 10.8
 } -returnCodes error -result {bad screen distance "foo"}
-
 test grid-10.9 {column/row configure} -body {
-	grid columnconfigure . 0 -minsize foo
+    grid columnconfigure . 0 -minsize foo
 } -cleanup {
     grid_reset 10.9
 } -returnCodes error -result {bad screen distance "foo"}
-
 test grid-10.10 {column/row configure} -body {
-	grid columnconfigure . 0 -minsize 10
-	grid columnconfigure . 0 -minsize
+    grid columnconfigure . 0 -minsize 10
+    grid columnconfigure . 0 -minsize
 } -cleanup {
     grid_reset 10.10
 } -result {10}
-
 test grid-10.11 {column/row configure} -body {
-	grid columnconfigure . 0 -weight bad
+    grid columnconfigure . 0 -weight bad
 } -cleanup {
     grid_reset 10.11
 } -returnCodes error -result {expected integer but got "bad"}
-
 test grid-10.12 {column/row configure} -body {
-	grid columnconfigure . 0 -weight -3
+    grid columnconfigure . 0 -weight -3
 } -cleanup {
     grid_reset 10.12
 } -returnCodes error -result {invalid arg "-weight": should be non-negative}
-
 test grid-10.13 {column/row configure} -body {
-	grid columnconfigure . 0 -weight 3
-	grid columnconfigure . 0 -weight
+    grid columnconfigure . 0 -weight 3
+    grid columnconfigure . 0 -weight
 } -cleanup {
     grid_reset 10.13
 } -result {3}
-
 test grid-10.14 {column/row configure} -body {
-	grid columnconfigure . 0 -pad foo
+    grid columnconfigure . 0 -pad foo
 } -cleanup {
     grid_reset 10.14
 } -returnCodes error -result {bad screen distance "foo"}
-
 test grid-10.15 {column/row configure} -body {
-	grid columnconfigure . 0 -pad -3
+    grid columnconfigure . 0 -pad -3
 } -cleanup {
     grid_reset 10.15
 } -returnCodes error -result {invalid arg "-pad": should be non-negative}
-
 test grid-10.16 {column/row configure} -body {
-	grid columnconfigure . 0 -pad 3
-	grid columnconfigure . 0 -pad
+    grid columnconfigure . 0 -pad 3
+    grid columnconfigure . 0 -pad
 } -cleanup {
     grid_reset 10.16
 } -result {3}
-
 test grid-10.17 {column/row configure} -body {
-	frame .f
-	set a ""
-	grid columnconfigure .f 0 -weight 0
-	lappend a [grid columnconfigure .f 0 -weight]
-	grid columnconfigure .f 0 -weight 1
-	lappend a [grid columnconfigure .f 0 -weight]
-	grid rowconfigure .f 0 -weight 0
-	lappend a [grid rowconfigure .f 0 -weight]
-	grid rowconfigure .f 0 -weight 1
-	lappend a [grid columnconfigure .f 0 -weight]
-	grid columnconfigure .f 0 -weight 0
-	set a
+    frame .f
+    set a ""
+    grid columnconfigure .f 0 -weight 0
+    lappend a [grid columnconfigure .f 0 -weight]
+    grid columnconfigure .f 0 -weight 1
+    lappend a [grid columnconfigure .f 0 -weight]
+    grid rowconfigure .f 0 -weight 0
+    lappend a [grid rowconfigure .f 0 -weight]
+    grid rowconfigure .f 0 -weight 1
+    lappend a [grid columnconfigure .f 0 -weight]
+    grid columnconfigure .f 0 -weight 0
+    return $a
 } -cleanup {
     grid_reset 10.17
 } -result {0 1 0 1}
-
 test grid-10.18 {column/row configure} -body {
-	frame .f
-	grid columnconfigure .f {0 2} -minsize 10 -weight 1
-	list [grid columnconfigure .f 0 -minsize] \
-		[grid columnconfigure .f 1 -minsize] \
-		[grid columnconfigure .f 2 -minsize] \
-		[grid columnconfigure .f 0 -weight] \
-		[grid columnconfigure .f 1 -weight] \
-		[grid columnconfigure .f 2 -weight]
+    frame .f
+    grid columnconfigure .f {0 2} -minsize 10 -weight 1
+    list [grid columnconfigure .f 0 -minsize] \
+	[grid columnconfigure .f 1 -minsize] \
+	[grid columnconfigure .f 2 -minsize] \
+	[grid columnconfigure .f 0 -weight] \
+	[grid columnconfigure .f 1 -weight] \
+	[grid columnconfigure .f 2 -weight]
 } -cleanup {
     grid_reset 10.18
 } -result {10 0 10 1 0 1}
-
 test grid-10.19 {column/row configure} -body {
-	grid columnconfigure . {0 -1 2} -weight 1
+    grid columnconfigure . {0 -1 2} -weight 1
 } -cleanup {
     grid_reset 10.19
 } -returnCodes error -result {grid columnconfigure: "-1" is out of range}
-
 test grid-10.20 {column/row configure} -body {
-	grid columnconfigure . 0 -uniform foo
-	grid columnconfigure . 0 -uniform
+    grid columnconfigure . 0 -uniform foo
+    grid columnconfigure . 0 -uniform
 } -cleanup {
     grid_reset 10.20
 } -result {foo}
-
 test grid-10.21 {column/row configure} -body {
     grid columnconfigure . .b -weight 1
 } -cleanup {
     grid_reset 10.21
 } -returnCodes error -result {grid columnconfigure: illegal index ".b"}
-
 test grid-10.22 {column/row configure} -body {
     button .b
     grid columnconfigure . .b -weight 1
 } -cleanup {
     grid_reset 10.22
 } -returnCodes error -result {grid columnconfigure: the window ".b" is not managed by "."}
-
 test grid-10.23 {column/row configure} -body {
     button .b
     grid .b -column 1 -columnspan 2
@@ -750,11 +688,10 @@ test grid-10.23 {column/row configure} -body {
     foreach i {0 1 2 3} {
         lappend res [grid columnconfigure . $i -weight]
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 10.23
 } -result {0 1 1 0}
-
 test grid-10.24 {column/row configure} -body {
     button .b
     button .c
@@ -768,11 +705,10 @@ test grid-10.24 {column/row configure} -body {
     foreach i {0 1 2 3 4 5 6} {
         lappend res [grid columnconfigure . $i -weight]
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 10.24
 } -result {0 1 2 2 2 1 0}
-
 test grid-10.25 {column/row configure} -body {
     button .b
     button .c
@@ -786,18 +722,16 @@ test grid-10.25 {column/row configure} -body {
     foreach i {0 1 2 3 4 5 6 7} {
         lappend res [grid rowconfigure . $i -weight]
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 10.25
 } -result {0 2 1 1 2 2 0 1}
-
 test grid-10.26 {column/row configure} -body {
     button .b
     grid columnconfigure .b 0
 } -cleanup {
     grid_reset 10.26
 } -result {-minsize 0 -pad 0 -uniform {} -weight 0}
-
 test grid-10.27 {column/row configure - no indices} -body {
     # Bug 1422430
     set t [toplevel .test]
@@ -834,23 +768,20 @@ test grid-10.32 {column/row configure} -body {
     append res [grid columnconfigure .f {.f.f 1} -weight 1]
     append res [grid columnconfigure .f {2 .f.f} -weight 1]
     destroy .f
-    set res
+    return $res
 } -cleanup {
     grid_reset 10.35
 } -result {}
-
 test grid-10.33 {column/row configure} -body {
     grid columnconfigure . all
 } -cleanup {
     grid_reset 10.36
-} -returnCodes error -result {expected integer but got "all" (when retreiving options only integer indices are allowed)}
-
+} -returnCodes error -result {expected integer but got "all" (when retrieving options only integer indices are allowed)}
 test grid-10.34 {column/row configure} -body {
     grid columnconfigure . 100000
 } -cleanup {
     grid_reset 10.37
 } -result {-minsize 0 -pad 0 -uniform {} -weight 0}
-
 test grid-10.35 {column/row configure} -body {
     # This is a test for bug 1423666 where a column >= 10000 caused
     # a crash in layout.  The update is needed to reach the layout stage.
@@ -863,7 +794,7 @@ test grid-10.35 {column/row configure} -body {
     lappend res [catch {grid .f -rowspan 2 -row 9998} msg] $msg ; update
     lappend res [catch {grid .f -column 9998 -columnspan 2} msg] $msg ; update
     lappend res [catch {grid .f -row 9998 -rowspan 2} msg] $msg ; update
-    set res
+    return $res
 } -cleanup {destroy .f} -result [lrange {
     1 {column out of bounds}
     1 {row out of bounds}
@@ -873,7 +804,6 @@ test grid-10.35 {column/row configure} -body {
     1 {row out of bounds}
 } 0 end]
 grid_reset 10.38
-
 test grid-10.36 {column/row configure} -body {
     # Additional tests for row/column overflow
     frame .f
@@ -887,7 +817,7 @@ test grid-10.36 {column/row configure} -body {
     grid forget .f .g
     lappend res [catch {eval grid [string repeat " x " 9999] .f} msg] $msg
     update
-    set res
+    return $res
 } -cleanup {destroy .f .g} -result [lrange {
     1 {row out of bounds}
     1 {row out of bounds}
@@ -896,42 +826,36 @@ test grid-10.36 {column/row configure} -body {
 } 0 end]
 grid_reset 10.39
 
-
 # auto-placement tests
 test grid-11.1 {default widget placement} -body {
-	grid ^
+    grid ^
 } -cleanup {
     grid_reset 11.1
 } -returnCodes error -result {can't use '^', cant find master}
-
 test grid-11.2 {default widget placement} -body {
-	button .b
-	grid .b ^
+    button .b
+    grid .b ^
 } -cleanup {
     grid_reset 11.2
 } -returnCodes error -result {can't find slave to extend with "^"}
-
 test grid-11.3 {default widget placement} -body {
-	button .b
-	grid .b - - .c
+    button .b
+    grid .b - - .c
 } -cleanup {
     grid_reset 11.3
 } -returnCodes error -result {bad window path name ".c"}
-
 test grid-11.4 {default widget placement} -body {
-	button .b
-	grid .b - - = -
+    button .b
+    grid .b - - = -
 } -cleanup {
     grid_reset 11.4
 } -returnCodes error -result {invalid window shortcut, "=" should be '-', 'x', or '^'}
-
 test grid-11.5 {default widget placement} -body {
-	button .b
-	grid .b - x -
+    button .b
+    grid .b - x -
 } -cleanup {
     grid_reset 11.5
 } -returnCodes error -result {must specify window before shortcut '-'}
-
 test grid-11.6 {default widget placement} -body {
     foreach i {1 2 3 4 5 6} {
 	frame .f$i -width 50 -height 50 -highlightthickness 0 -bg red
@@ -944,11 +868,10 @@ test grid-11.6 {default widget placement} -body {
 	lappend a "[winfo x .f$i],[winfo y .f$i] \
 		[winfo width .f$i],[winfo height .f$i]"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 11.6
 } -result {{0,50  100,50} {150,50  50,50}}
-
 test grid-11.7 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -row 5 -column 5
@@ -956,7 +879,6 @@ test grid-11.7 {default widget placement} -body {
 } -cleanup {
     grid_reset 11.7
 } -returnCodes error -result {must specify window before shortcut '-'}
-
 test grid-11.8 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -row 5 -column 5
@@ -964,7 +886,6 @@ test grid-11.8 {default widget placement} -body {
 } -cleanup {
     grid_reset 11.8
 } -returnCodes error -result {must specify window before shortcut '-'}
-
 test grid-11.9 {default widget placement} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -row 5 -column 5
@@ -972,10 +893,9 @@ test grid-11.9 {default widget placement} -body {
 } -cleanup {
     grid_reset 11.9
 } -returnCodes error -result {can't find slave to extend with "^"}
-
 test grid-11.10 {default widget placement} -body {
     foreach i {1 2 3} {
-		frame .f$i -width 100 -height 50 -highlightthickness 0 -bg red
+	frame .f$i -width 100 -height 50 -highlightthickness 0 -bg red
     }
     grid .f1 .f2  -sticky nsew
     grid .f3   ^  -sticky nsew
@@ -985,57 +905,54 @@ test grid-11.10 {default widget placement} -body {
 	lappend a "[winfo x .f$i],[winfo y .f$i] \
 		[winfo width .f$i],[winfo height .f$i]"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 11.10
 } -result {{0,0  100,50} {100,0  100,100} {0,50  100,50}}
-
 test grid-11.11 {default widget placement} -body {
     foreach i {1 2 3 4 5 6 7 8 9 10 11 12} {
-		frame .f$i -width 50 -height 50 -highlightthickness 1 -highlightbackground black
+	frame .f$i -width 50 -height 50 -highlightthickness 1 -highlightbackground black
     }
-    grid .f1  .f2  .f3 .f4 -sticky nsew
+    grid .f1  .f2  .f3 .f4  -sticky nsew
     grid .f5  .f6   -  .f7  -sticky nsew
     grid .f8    ^   ^  .f9  -sticky nsew
-    grid .f10   ^   ^  .f11  -sticky nsew
-	grid .f12   -   -   - -sticky nsew
+    grid .f10   ^   ^  .f11 -sticky nsew
+    grid .f12   -   -   -   -sticky nsew
     update
     set a ""
     foreach i {5 6 7 8 9 10 11 12 } {
 	lappend a "[winfo x .f$i],[winfo y .f$i] \
 		[winfo width .f$i],[winfo height .f$i]"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 11.11
 } -result {{0,50  50,50} {50,50  100,150} {150,50  50,50} {0,100  50,50} {150,100  50,50} {0,150  50,50} {150,150  50,50} {0,200  200,50}}
-
 test grid-11.12 {default widget placement} -body {
     foreach i {1 2 3 4} {
-		frame .f$i -width 75 -height 50 -highlightthickness 1 -highlightbackground black
+	frame .f$i -width 75 -height 50 -highlightthickness 1 -highlightbackground black
     }
     grid .f1  .f2   .f3     -sticky nsew
     grid .f4    ^           -sticky nsew
     update
     set a ""
     foreach i {1 2 3 4} {
-		lappend a "[winfo x .f$i],[winfo y .f$i] \
-			[winfo width .f$i],[winfo height .f$i]"
+	lappend a "[winfo x .f$i],[winfo y .f$i] \
+		[winfo width .f$i],[winfo height .f$i]"
     }
     grid .f4    ^   -column 1
     update
     foreach i {1 2 3 4} {
-		lappend a "[winfo x .f$i],[winfo y .f$i] \
-			[winfo width .f$i],[winfo height .f$i]"
-	}
-	set a
+	lappend a "[winfo x .f$i],[winfo y .f$i] \
+		[winfo width .f$i],[winfo height .f$i]"
+    }
+    return $a
 } -cleanup {
     grid_reset 11.12
 } -result {{0,0  75,50} {75,0  75,100} {150,0  75,50} {0,50  75,50} {0,0  75,50} {75,0  75,100} {150,0  75,100} {75,50  75,50}}
-
 test grid-11.13 {default widget placement} -body {
     foreach i {1 2 3 4 5 6 7} {
-		frame .f$i -width 40 -height 50 -highlightthickness 1 -highlightbackground black
+	frame .f$i -width 40 -height 50 -highlightthickness 1 -highlightbackground black
     }
     grid .f1  .f2  .f3 .f4 .f5 -sticky nsew
     grid .f6    -  .f7         -sticky nsew -columnspan 2
@@ -1045,11 +962,10 @@ test grid-11.13 {default widget placement} -body {
 	lappend a "[winfo x .f$i],[winfo y .f$i] \
 		[winfo width .f$i],[winfo height .f$i]"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 11.13
 } -result {{0,50  120,50} {120,50  80,50}}
-
 test grid-11.14 {default widget placement} -body {
     foreach i {1 2 3} {
 	frame .f$i -width 60 -height 60 -highlightthickness 0 -bg red
@@ -1062,11 +978,10 @@ test grid-11.14 {default widget placement} -body {
 	lappend a "[winfo x .f$i],[winfo y .f$i] \
 		[winfo width .f$i],[winfo height .f$i]"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 11.14
 } -result {{0,30  60,60} {60,0  60,60} {60,60  60,60}}
-
 test grid-11.15 {^ ^ test with multiple windows} -body {
     foreach i {1 2 3 4} {
 	frame .f$i -width 50 -height 50 -bd 1 -relief solid
@@ -1079,11 +994,10 @@ test grid-11.15 {^ ^ test with multiple windows} -body {
 	lappend a "[winfo x .f$i],[winfo y .f$i]\
 		[winfo width .f$i],[winfo height .f$i]"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 11.15
 } -result {{0,0 50,50} {50,0 50,100} {100,0 50,100} {0,50 50,50}}
-
 test grid-11.16 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
@@ -1098,7 +1012,6 @@ test grid-11.16 {default widget placement} -body {
 } -cleanup {
     grid_reset 11.16
 } -result {50 100 50}
-
 test grid-11.17 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
@@ -1113,7 +1026,6 @@ test grid-11.17 {default widget placement} -body {
 } -cleanup {
     grid_reset 11.17
 } -result {100 50 100}
-
 test grid-11.18 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
@@ -1130,7 +1042,6 @@ test grid-11.18 {default widget placement} -body {
 } -cleanup {
     grid_reset 11.18
 } -result {100 100 100 50}
-
 test grid-11.19 {default widget placement} -body {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
@@ -1139,7 +1050,6 @@ test grid-11.19 {default widget placement} -body {
     grid .c .d -sticky news
     grid ^     -in . -row 2
     grid x  ^  -in . -row 1
-
     grid rowconfigure . {0 1 2} -uniform a
     update
     set res ""
@@ -1151,7 +1061,6 @@ test grid-11.19 {default widget placement} -body {
     grid_reset 11.19
 } -result {50 100 100 50}
 
-
 test grid-12.1 {-sticky} -body {
     catch {unset data}
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
@@ -1167,7 +1076,7 @@ test grid-12.1 {-sticky} -body {
 	array set data [grid info .f]
 	append a "($data(-sticky)) [winfo x .f] [winfo y .f] [winfo width .f] [winfo height .f]\n"
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 12.1
 } -result {() 25 25 200 100
@@ -1187,14 +1096,12 @@ test grid-12.1 {-sticky} -body {
 (new) 0 0 250 100
 (nesw) 0 0 250 150
 }
-
 test grid-12.2 {-sticky} -body {
     frame .f -bg red
     grid .f -sticky glue
 } -cleanup {
     grid_reset 12.2
 } -returnCodes error -result {bad stickyness value "glue": must be a string containing n, e, s, and/or w}
-
 test grid-12.3 {-sticky} -body {
     frame .f -bg red
     grid .f -sticky {n,s,e,w}
@@ -1204,14 +1111,12 @@ test grid-12.3 {-sticky} -body {
     grid_reset 12.3
 } -result {nesw}
 
-
 test grid-13.1 {-in} -body {
     frame .f -bg red
     grid .f -in .f
 } -cleanup {
     grid_reset 13.1
 } -returnCodes error -result {window can't be managed in itself}
-
 test grid-13.2 {-in} -body {
     frame .f -bg red
     list [winfo manager .f] \
@@ -1220,14 +1125,12 @@ test grid-13.2 {-in} -body {
 } -cleanup {
     grid_reset 13.1.1
 } -result {{} 1 {window can't be managed in itself} {}}
-
 test grid-13.3 {-in} -body {
     frame .f -bg red
     grid .f -in .bad
 } -cleanup {
     grid_reset 13.2
 } -returnCodes error -result {bad window path name ".bad"}
-
 test grid-13.4 {-in} -body {
     frame .f -bg red
     toplevel .top
@@ -1236,21 +1139,18 @@ test grid-13.4 {-in} -body {
     grid_reset 13.3
 } -returnCodes error -result {can't put .f inside .top}
 destroy .top
-
 test grid-13.5 {-ipadx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -ipadx x
 } -cleanup {
     grid_reset 13.4
 } -returnCodes error -result {bad ipadx value "x": must be positive screen distance}
-
 test grid-13.6 {-ipadx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -ipadx {5 5}
 } -cleanup {
     grid_reset 13.4.1
 } -returnCodes error -result {bad ipadx value "5 5": must be positive screen distance}
-
 test grid-13.7 {-ipadx} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -1262,21 +1162,18 @@ test grid-13.7 {-ipadx} -body {
 } -cleanup {
     grid_reset 13.5
 } -result {200 202}
-
 test grid-13.8 {-ipady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -ipady x
 } -cleanup {
     grid_reset 13.6
 } -returnCodes error -result {bad ipady value "x": must be positive screen distance}
-
 test grid-13.9 {-ipady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -ipady {5 5}
 } -cleanup {
     grid_reset 13.6.1
 } -returnCodes error -result {bad ipady value "5 5": must be positive screen distance}
-
 test grid-13.10 {-ipady} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -1288,21 +1185,18 @@ test grid-13.10 {-ipady} -body {
 } -cleanup {
     grid_reset 13.7
 } -result {100 102}
-
 test grid-13.11 {-padx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -padx x
 } -cleanup {
     grid_reset 13.8
 } -returnCodes error -result {bad pad value "x": must be positive screen distance}
-
 test grid-13.12 {-padx} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -padx {10 x}
 } -cleanup {
     grid_reset 13.8.1
 } -returnCodes error -result {bad 2nd pad value "x": must be positive screen distance}
-
 test grid-13.13 {-padx} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -1314,7 +1208,6 @@ test grid-13.13 {-padx} -body {
 } -cleanup {
     grid_reset 13.9
 } -result {{200 200} {200 202 1}}
-
 test grid-13.14 {-padx} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -1326,21 +1219,18 @@ test grid-13.14 {-padx} -body {
 } -cleanup {
     grid_reset 13.9.1
 } -result {{200 200} {200 215 10}}
-
 test grid-13.15 {-pady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -pady x
 } -cleanup {
     grid_reset 13.10
 } -returnCodes error -result {bad pad value "x": must be positive screen distance}
-
 test grid-13.16 {-pady} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid .f -pady {10 x}
 } -cleanup {
     grid_reset 13.10.1
 } -returnCodes error -result {bad 2nd pad value "x": must be positive screen distance}
-
 test grid-13.17 {-pady} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -1352,7 +1242,6 @@ test grid-13.17 {-pady} -body {
 } -cleanup {
     grid_reset 13.11
 } -result {{100 100} {100 102 1}}
-
 test grid-13.18 {-pady} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     grid .f
@@ -1364,27 +1253,25 @@ test grid-13.18 {-pady} -body {
 } -cleanup {
     grid_reset 13.11.1
 } -result {{100 100} {100 120 4}}
-
 test grid-13.19 {-ipad x and y} -body {
     frame .f -width 20 -height 20 -highlightthickness 0 -bg red
     grid columnconfigure . 0 -minsize 150
     grid rowconfigure . 0 -minsize 100
     set a ""
     foreach x {0 5} {
-    	foreach y {0 5} {
+	foreach y {0 5} {
 	    grid .f -ipadx $x -ipady $y
 	    update
 	    append a " $x,$y:"
 	    foreach prop {x y width height} {
-	    	append a ,[winfo $prop .f]
+		append a ,[winfo $prop .f]
 	    }
 	}
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 13.12
 } -result { 0,0:,65,40,20,20 0,5:,65,35,20,30 5,0:,60,40,30,20 5,5:,60,35,30,30}
-
 test grid-13.20 {reparenting} -body {
     frame .1
     frame .2
@@ -1398,12 +1285,11 @@ test grid-13.20 {reparenting} -body {
     catch {unset info}; array set info [grid info .b]
     lappend a [grid slaves .1],[grid slaves .2],$info(-in)
     unset info
-    set a
+    return $a
 } -cleanup {
     grid_reset 13.13
 } -result {.b,,.1 ,.b,.2}
 
-
 test grid-14.1 {structure notify} -body {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     frame .g -width 200 -height 100 -highlightthickness 0 -bg red
@@ -1417,11 +1303,10 @@ test grid-14.1 {structure notify} -body {
     update
     lappend a "[winfo x .g],[winfo y .g] \
         [winfo width .g],[winfo height .g]"
-    set a
+    return $a
 } -cleanup {
     grid_reset 14.1
 } -result {{0,0  200,100} {5,5  200,100}}
-
 test grid-14.2 {structure notify} -body {
     frame .f -width 200 -height 100
     frame .f.g -width 200 -height 100
@@ -1436,10 +1321,7 @@ test grid-14.2 {structure notify} -body {
 } -cleanup {
     grid_reset 14.2
 } -result {{0 0 200 100,0 0 200 100} {0 0 240 140,20 20 200 100}}
-
-test grid-14.3 {map notify: bug 1648} -constraints {
-	nonPortable
-} -body {
+test grid-14.3 {map notify: bug 1648} -constraints {nonPortable} -body {
     # This test is nonPortable because the number of times
     # A(.) will be incremented is unspecified--the behavior
     # is different accross window managers.
@@ -1462,7 +1344,6 @@ test grid-14.3 {map notify: bug 1648} -constraints {
     grid_reset 14.3
 } -result {.2 2 .0 1 . 2 .1 1}
 
-
 test grid-15.1 {lost slave} -body {
     button .b
     grid .b
@@ -1474,7 +1355,6 @@ test grid-15.1 {lost slave} -body {
 } -cleanup {
     grid_reset 15.1
 } -result {.b {} .b}
-
 test grid-15.2 {lost slave} -body {
     frame .f
     grid .f
@@ -1489,11 +1369,10 @@ test grid-15.2 {lost slave} -body {
     grid_reset 15.2
 } -result {.b {} .b}
 
-
 test grid-16.1 {layout centering} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
+	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
     }
     grid propagate . 0
     grid anchor . center
@@ -1503,13 +1382,12 @@ test grid-16.1 {layout centering} -body {
 } -cleanup {
     grid_reset 16.1
 } -result {37 50 225 150}
-
 test grid-16.2 {layout weights (expanding)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
-    	grid rowconfigure . $i -weight [expr $i + 1]
-    	grid columnconfigure . $i -weight [expr $i + 1]
+	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
+	grid rowconfigure . $i -weight [expr $i + 1]
+	grid columnconfigure . $i -weight [expr $i + 1]
     }
     grid propagate . 0
     . configure -width 500 -height 300
@@ -1518,17 +1396,16 @@ test grid-16.2 {layout weights (expanding)} -body {
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.2
 } -result {120-75 167-100 213-125}
-
 test grid-16.3 {layout weights (shrinking)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray -width 100 -height 75 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
-    	grid rowconfigure . $i -weight [expr $i + 1]
-    	grid columnconfigure . $i -weight [expr $i + 1]
+	frame .$i -bg gray -width 100 -height 75 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
+	grid rowconfigure . $i -weight [expr $i + 1]
+	grid columnconfigure . $i -weight [expr $i + 1]
     }
     grid propagate . 0
     . configure -width 200 -height 150
@@ -1537,17 +1414,16 @@ test grid-16.3 {layout weights (shrinking)} -body {
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.3
 } -result {84-63 66-50 50-37}
-
 test grid-16.4 {layout weights (shrinking with minsize)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
-    	grid rowconfigure . $i -weight [expr $i + 1] -minsize 45
-    	grid columnconfigure . $i -weight [expr $i + 1] -minsize 65
+	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
+	grid rowconfigure . $i -weight [expr $i + 1] -minsize 45
+	grid columnconfigure . $i -weight [expr $i + 1] -minsize 65
     }
     grid propagate . 0
     . configure -width 200 -height 150
@@ -1556,17 +1432,16 @@ test grid-16.4 {layout weights (shrinking with minsize)} -body {
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.4
 } -result {70-60 65-45 65-45}
-
 test grid-16.5 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
-    	grid rowconfigure . $i -weight 0 -minsize 70
-    	grid columnconfigure . $i -weight 0 -minsize 90
+	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
+	grid rowconfigure . $i -weight 0 -minsize 70
+	grid columnconfigure . $i -weight 0 -minsize 90
     }
     grid propagate . 0
     . configure -width 100 -height 75
@@ -1575,18 +1450,16 @@ test grid-16.5 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.5
 } -result {100-75 100-75 100-75}
-
-
 test grid-16.6 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
-    	grid rowconfigure . $i -weight [expr $i + 1] -minsize 52
-    	grid columnconfigure . $i -weight [expr $i + 1] -minsize 69
+	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
+	grid rowconfigure . $i -weight [expr $i + 1] -minsize 52
+	grid columnconfigure . $i -weight [expr $i + 1] -minsize 69
     }
     grid propagate . 0
     . configure -width 200 -height 150
@@ -1595,11 +1468,10 @@ test grid-16.6 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.6
 } -result {69-52 69-52 69-52}
-
 # test fails when run alone
 # reason (I think): -minsize 0 causes both:
 # [winfo ismapped .$i] => 0 and
@@ -1608,8 +1480,8 @@ test grid-16.6 {layout weights (shrinking at minsize)} -body {
 # That doesn't happen if previous tests run
 test grid-16.7 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
+	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
     }
     grid propagate . 0
     grid columnconfigure . 1 -weight 1 -minsize 0
@@ -1620,15 +1492,14 @@ test grid-16.7 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2} {
 	lappend a [winfo width .$i]-[winfo height .$i]-[winfo ismapped .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.7
 } -result {100-75-1 1-1-0 100-75-1}
-
 test grid-16.8 {layout internal constraints} -body {
     foreach i {0 1 2 3 4} {
-    	frame .$i -bg gray  -width 30 -height 25 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
+	frame .$i -bg gray  -width 30 -height 25 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
     }
     frame .f -bg red -width 250 -height 200
     frame .g -bg green -width 200 -height 180
@@ -1639,32 +1510,31 @@ test grid-16.8 {layout internal constraints} -body {
     update
     set a ""
     foreach i {0 1 2 3 4} {
-    	append a "[winfo x .$i] "
+	append a "[winfo x .$i] "
     }
     append a ", "
     grid remove .f
     update
     foreach i {0 1 2 3 4} {
-    	append a "[winfo x .$i] "
+	append a "[winfo x .$i] "
     }
     append a ", "
     grid remove .g
     grid .f
     update
     foreach i {0 1 2 3 4} {
-    	append a "[winfo x .$i] "
+	append a "[winfo x .$i] "
     }
     append a ", "
     grid remove .f
     update
     foreach i {0 1 2 3 4} {
-    	append a "[winfo x .$i] "
+	append a "[winfo x .$i] "
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.8
 } -result {0 30 130 230 280 , 0 30 130 230 260 , 0 30 113 196 280 , 0 30 60 90 120 }
-
 test grid-16.9 {layout uniform} -body {
     frame .f1 -width 75 -height 50
     frame .f2 -width 60 -height 25
@@ -1682,14 +1552,12 @@ test grid-16.9 {layout uniform} -body {
 } -cleanup {
     grid_reset 16.9
 } -result {{0 0 135 75} {0 75 135 100} {0 175 135 75} {0 250 135 100} {0 350 135 40}}
-
 test grid-16.10 {layout uniform} -body {
     grid [frame .f1 -width  75 -height  50] -row 0 -column 0
     grid [frame .f2 -width  60 -height  30] -row 1 -column 2
     grid [frame .f3 -width  95 -height  90] -row 2 -column 1
     grid [frame .f4 -width  60 -height 100] -row 3 -column 4
     grid [frame .f5 -width  60 -height  40] -row 4 -column 3
-
     grid rowconfigure . {0 1} -uniform a
     grid rowconfigure . {2 4} -uniform b
     grid rowconfigure . {0 2} -weight 2
@@ -1704,7 +1572,6 @@ test grid-16.10 {layout uniform} -body {
 } -cleanup {
     grid_reset 16.10
 } -result {{0 0 75 60} {170 60 150 30} {75 90 95 90} {390 180 140 100} {320 280 70 45}}
-
 test grid-16.11 {layout uniform (shrink)} -body {
     frame .f1 -width 75 -height 50
     frame .f2 -width 100 -height 95
@@ -1721,7 +1588,6 @@ test grid-16.11 {layout uniform (shrink)} -body {
 } -cleanup {
     grid_reset 16.11
 } -result {{0 0 100 95} {100 0 100 95} {0 0 50 95} {50 0 100 95}}
-
 test grid-16.12 {layout uniform (grow)} -body {
     frame .f1 -width 40 -height 50
     frame .f2 -width 50 -height 95
@@ -1737,7 +1603,6 @@ test grid-16.12 {layout uniform (grow)} -body {
     set res {}
     lappend res [grid bbox . 0 0] [grid bbox . 1 0]
     lappend res [grid bbox . 2 0] [grid bbox . 3 0]
-
     grid propagate . 0
     . configure -width 350 -height 95
     update
@@ -1747,15 +1612,12 @@ test grid-16.12 {layout uniform (grow)} -body {
     grid_reset 16.12
 } -result [list {0 0 50 95} {50 0 50 95} {100 0 100 95} {200 0 70 95} \
         {0 0 70 95} {70 0 50 95} {120 0 140 95} {260 0 90 95}]
-
 test grid-16.13 {layout span} -body {
     frame .f1 -width 24 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
-
     grid .f1 - - .f2
     grid .f3 - - -
-
     set res {}
     foreach w {{0 1 0 0} {0 0 1 0} {1 3 4 0} {1 2 1 2} {1 1 1 12}} {
         for {set c 0} {$c < 4} {incr c} {
@@ -1768,22 +1630,19 @@ test grid-16.13 {layout span} -body {
         }
         lappend res $res2
     }
-    set res
+    return $res
     # The last result below should ideally be 8 8 8 126 but the current
     # implementation is not exact enough.
 } -cleanup {
     grid_reset 16.13
 } -result [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 14 42 56 38 0] \
            [list 18 38 18 76 0] [list 7 8 9 126 0]]
-
 test grid-16.14 {layout span} -body {
     frame .f1 -width 110 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
-
     grid .f1 - - .f2
     grid .f3 - - -
-
     set res {}
     foreach w {{0 1 0 0} {0 0 1 0} {1 3 4 0} {1 2 1 3} {1 1 1 12}} {
         for {set c 0} {$c < 4} {incr c} {
@@ -1796,20 +1655,17 @@ test grid-16.14 {layout span} -body {
         }
         lappend res $res2
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 16.14
 } -result [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 14 42 56 38 0] \
            [list 27 55 28 40 0] [list 36 37 37 40 0]]
-
 test grid-16.15 {layout span} -body {
     frame .f1 -width 24 -height 20
     frame .f2 -width 38 -height 20
     frame .f3 -width 150 -height 20
-
     grid .f1 - - .f2
     grid x .f3 - -
-
     set res {}
     foreach w {{0 1 0 0} {0 0 1 0} {1 0 1 0} {0 0 0 0} {1 0 0 6}} {
         for {set c 0} {$c < 4} {incr c} {
@@ -1822,12 +1678,11 @@ test grid-16.15 {layout span} -body {
         }
         lappend res $res2
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 16.15
 } -result [list [list 0 112 0 38 0] [list 0 0 112 38 0] [list 0 0 112 38 0] \
            [list 0 37 37 76 0] [list 0 12 12 126 0]]
-
 test grid-16.16 {layout span} -body {
     frame .f1 -width 64 -height 20
     frame .f2 -width 38 -height 20
@@ -1835,11 +1690,9 @@ test grid-16.16 {layout span} -body {
     frame .f4 -width 15 -height 20
     frame .f5 -width 18 -height 20
     frame .f6 -width 20 -height 20
-
     grid .f1 - x .f2
     grid .f3 - - -
     grid .f4 .f5 .f6
-
     set res {}
     foreach w {{1 1 5 1} {0 0 1 0} {1 3 4 0} {1 2 1 2} {1 1 1 12}} {
         for {set c 0} {$c < 4} {incr c} {
@@ -1852,16 +1705,15 @@ test grid-16.16 {layout span} -body {
         }
         lappend res $res2
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 16.16
 } -result [list [list 30 34 43 43 0] [list 30 34 48 38 0] [list 22 42 48 38 0] \
            [list 25 39 29 57 0] [list 30 34 22 64 0]]
-
 test grid-16.17 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2 3} {
-    	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
+	frame .$i -bg gray  -width 100 -height 75 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
     }
     grid propagate . 0
     grid columnconfigure . {0 1} -weight 1 -minsize 0
@@ -1877,21 +1729,18 @@ test grid-16.17 {layout weights (shrinking at minsize)} -body {
     foreach i {0 1 2 3} {
 	lappend a [winfo width .$i]-[winfo height .$i]-[winfo ismapped .$i]
     }
-    set a
+    return $a
 } -cleanup {
     grid_reset 16.17
 } -result {25-25-1 25-25-1 100-75-1 100-75-1 25-25-0 25-25-0 100-75-1 100-75-1}
-
 test grid-16.18 {layout span} -body {
     frame .f1 -width 30  -height 20
     frame .f2 -width 166 -height 20
     frame .f3 -width 39  -height 20
     frame .f4 -width 10  -height 20
-
     grid .f1 .f3 -
     grid .f2 -   .f4
     grid columnconfigure . 0 -weight 1
-
     set res {}
     foreach w {{1 0 0} {0 1 0} {0 0 1}} {
         for {set c 0} {$c < 3} {incr c} {
@@ -1904,11 +1753,10 @@ test grid-16.18 {layout span} -body {
         }
         lappend res $res2
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 16.18
 } -result [list [list 137 29 10] [list 30 136 10] [list 98 68 10]]
-
 test grid-16.19 {layout span} -constraints { knownBug } -body {
     # This test shows the problem in Bug 2075285
     # Several overlapping multi-span widgets is a weak spot
@@ -1918,26 +1766,22 @@ test grid-16.19 {layout span} -constraints { knownBug } -body {
     frame .f2 -width 20  -height 20
     frame .f3 -width 10  -height 20
     frame .f4 -width 20  -height 20
-
     grid .f1 - -   - -   - -sticky we
     grid .f2 - .f3 - .f4 - -sticky we
     grid columnconfigure . {1 5} -weight 1
-
     set res {}
     update
     for {set c 0} {$c <= 5} {incr c} {
         lappend res [lindex [grid bbox . $c 0] 2]
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 16.19
 } -result [list 0 45 5 5 0 45]
 
-
 test grid-17.1 {forget and pending idle handlers} -body {
     # This test is intended to detect a crash caused by a failure to remove
     # pending idle handlers when grid forget is invoked.
-
     toplevel .t
     wm geometry .t +0+0
     frame .t.f
@@ -1948,7 +1792,6 @@ test grid-17.1 {forget and pending idle handlers} -body {
     grid forget .t.f.l
     grid forget .t.f
     destroy .t
-
     toplevel .t
     frame .t.f
     label .t.f.l -text foobar
@@ -1974,7 +1817,7 @@ test grid-18.1 {test respect for internalborder} -body {
     update
     lappend res [winfo geometry .pack.lf.f]
     destroy .pack
-    set res
+    return $res
 } -result {196x188+2+10 177x186+5+7}
 test grid-18.2 {test support for minreqsize} -body {
     toplevel .pack
@@ -1990,10 +1833,9 @@ test grid-18.2 {test support for minreqsize} -body {
     update
     lappend res [winfo geometry .pack.lf]
     destroy .pack
-    set res
+    return $res
 } -result {162x127+0+0 172x112+0+0}
 
-
 test grid-19.1 {uniform realloc} -body {
     # Use a lot of uniform groups to test the reallocation mechanism
     for {set t 0} {$t < 100} {incr t 2} {
@@ -2008,7 +1850,6 @@ test grid-19.1 {uniform realloc} -body {
     grid_reset 19.1
 } -result {0 0 600 20}
 
-
 test grid-20.1 {recalculate size after removal (destroy)} -body {
     label .l1 -text l1
     grid .l1 -row 2 -column 2
@@ -2019,7 +1860,6 @@ test grid-20.1 {recalculate size after removal (destroy)} -body {
 } -cleanup {
     grid_reset 20.1
 } -result {1 1}
-
 test grid-20.2 {recalculate size after removal (forget)} -body {
     label .l1 -text l1
     grid .l1 -row 2 -column 2
@@ -2031,58 +1871,50 @@ test grid-20.2 {recalculate size after removal (forget)} -body {
     grid_reset 20.2
 } -result {1 1}
 
-
 test grid-21.1 {anchor} -body {
     grid anchor . 1 xxx
 } -cleanup {
     grid_reset 21.1
 } -returnCodes error -result {wrong # args: should be "grid anchor window ?anchor?"}
-
 test grid-21.2 {anchor} -body {
     grid anchor .
 } -cleanup {
     grid_reset 21.2
 } -result {nw}
-
 test grid-21.3 {anchor} -body {
     grid anchor . se;grid anchor .
 } -cleanup {
     grid_reset 21.3
 } -result {se}
-
 test grid-21.4 {anchor} -body {
     grid anchor .x
 } -cleanup {
     grid_reset 21.4
 } -returnCodes error -result {bad window path name ".x"}
-
 test grid-21.5 {anchor} -body {
     grid anchor . x
 } -cleanup {
     grid_reset 21.5
 } -returnCodes error -result {bad anchor "x": must be n, ne, e, se, s, sw, w, nw, or center}
-
 test grid-21.6 {anchor} -body {
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
-    	grid .$i -row $i -column $i -sticky nswe
+	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
+	grid .$i -row $i -column $i -sticky nswe
     }
     grid propagate . 0
     . configure -width 300 -height 250
-
     set res {}
     foreach a {n ne e se s sw w nw center} {
         grid anchor . $a
         update
         lappend res [grid bbox .]
     }
-    set res
+    return $res
 } -cleanup {
     grid_reset 21.6
 } -result [list {37 0 225 150} {75 0 225 150} {75 50 225 150} {75 100 225 150} \
            {37 100 225 150} {0 100 225 150} {0 50 225 150} {0 0 225 150} \
            {37 50 225 150}]
-
 test grid-21.7 {anchor} -body {
     # Test with a non-symmetric internal border.
     # This only tests vertically, there is currently no way to get
@@ -2091,15 +1923,13 @@ test grid-21.7 {anchor} -body {
     frame .f.x -width 20 -height 20
     .f configure -labelwidget .f.x
     pack .f -fill both -expand 1
-
     foreach i {0 1 2} {
-    	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
-    	grid .$i -in .f -row $i -column $i -sticky nswe
+	frame .$i -bg gray  -width 75 -height 50 -bd 2 -relief ridge
+	grid .$i -in .f -row $i -column $i -sticky nswe
     }
     pack propagate . 0
     grid propagate .f 0
     . configure -width 300 -height 250
-
     set res {}
     foreach a {n ne e se s sw w nw center} {
         grid anchor .f $a
@@ -2107,7 +1937,7 @@ test grid-21.7 {anchor} -body {
         lappend res [grid bbox .f]
     }
     pack propagate . 1 ; wm geometry . {}
-    set res
+    return $res
 } -cleanup {
     grid_reset 21.7
 } -result [list {37 20 225 150} {75 20 225 150} {75 60 225 150} {75 100 225 150} \
@@ -2117,17 +1947,15 @@ test grid-21.7 {anchor} -body {
 test grid-22.1 {remove: basic argument checking} {
     list [catch {grid remove foo} msg] $msg
 } {1 {bad window path name "foo"}}
-
 test grid-22.2 {remove} {
     button .c
     grid [button .b]
     set a [grid slaves .]
     grid remove .b .c
     lappend a [grid slaves .]
-    set a
+    return $a
 } {.b {}}
 grid_reset 22.2
-
 test grid-22.3 {remove} {
     button .c
     grid .c -row 2 -column 2 -rowspan 2 -columnspan 2 -padx 3 -pady 4 -sticky ns
@@ -2136,7 +1964,6 @@ test grid-22.3 {remove} {
     grid info .c
 } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx 3 -pady 4 -sticky ns}
 grid_reset 22.3
-
 test grid-22.3.1 {remove} {
     frame .a
     button .c
@@ -2146,7 +1973,6 @@ test grid-22.3.1 {remove} {
     grid info .c
 } {-in .a -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
 grid_reset 22.3.1
-
 test grid-22.4 {remove, calling Tk_UnmaintainGeometry} {
     frame .f -bd 2 -relief raised
     place .f -x 10 -y 20 -width 200 -height 100
@@ -2160,7 +1986,6 @@ test grid-22.4 {remove, calling Tk_UnmaintainGeometry} {
     lappend x [winfo ismapped .f2]
 } {1 0}
 grid_reset 22.4
-
 test grid-22.5 {remove} {
     frame .a
     button .c
@@ -2173,7 +1998,11 @@ test grid-22.5 {remove} {
     grid info .c
 } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
 grid_reset 22.5
-
+
 # cleanup
 cleanupTests
 return
+
+# Local Variables:
+# mode: tcl
+# End: