Merge 8.7. More indent fixes

tcltk · Sep 29, 2024 · b78d24b · b78d24b
2 parents 5fa0db9 + 575910a
commit b78d24b
Show file tree

Hide file tree

Showing 79 changed files with 3,121 additions and 3,118 deletions.
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
@@ -691,6 +691,7 @@ Tk_CanvasObjCmd(
     canvasPtr->confine = 0;
     canvasPtr->textInfo.selBorder = NULL;
     canvasPtr->textInfo.selBorderWidth = 0;
+    canvasPtr->textInfo.reserved3 = NULL;
     canvasPtr->textInfo.selFgColorPtr = NULL;
     canvasPtr->textInfo.selItemPtr = NULL;
     canvasPtr->textInfo.selectFirst = TCL_INDEX_NONE;
@@ -699,7 +700,9 @@ Tk_CanvasObjCmd(
     canvasPtr->textInfo.selectAnchor = 0;
     canvasPtr->textInfo.insertBorder = NULL;
     canvasPtr->textInfo.insertWidth = 0;
+    canvasPtr->textInfo.reserved2 = NULL;
     canvasPtr->textInfo.insertBorderWidth = 0;
+    canvasPtr->textInfo.reserved1 = NULL;
     canvasPtr->textInfo.focusItemPtr = NULL;
     canvasPtr->textInfo.gotFocus = 0;
     canvasPtr->textInfo.cursorOn = 0;

diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
@@ -171,7 +171,7 @@ typedef struct {
     Tk_Cursor cursor;		/* Current cursor for window, or NULL. */
     Tcl_Obj *takeFocusObj;	/* Value of -takefocus option; not used in the
 				 * C code, but used by keyboard traversal
-				 * scripts. Malloc'ed, but may be NULL. */
+				 * scripts. May be NULL. */
     int flags;			/* Various flags; see below for
 				 * definitions. */
 #ifdef BUILD_tk

diff --git a/library/bgerror.tcl b/library/bgerror.tcl
@@ -22,7 +22,7 @@ namespace eval ::tk::dialog::error {
 	option add *ErrorDialog*background systemAlertBackgroundActive \
 		widgetDefault
 	option add *ErrorDialog*info.text.background \
-	systemTextBackgroundColor widgetDefault
+		systemTextBackgroundColor widgetDefault
 	option add *ErrorDialog*Button.highlightBackground \
 		systemAlertBackgroundActive widgetDefault
     }

diff --git a/library/demos/images/Tcl.svg b/library/demos/images/Tcl.svg
diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl
@@ -58,12 +58,12 @@ proc Next {square} {
 	if {[lsearch -exact -integer $visited $testSquare] < 0} {
 	    set count [CheckSquare $testSquare]
 	    if {$count < $minimum} {
-	set minimum $count
-	set nextSquare $testSquare
+		set minimum $count
+		set nextSquare $testSquare
 	    } elseif {$count == $minimum} {
-	# to remove the enhancement to Warnsdorff's rule
-	# remove the next line:
-	set nextSquare [Edgemost $nextSquare $testSquare]
+		# to remove the enhancement to Warnsdorff's rule
+		# remove the next line:
+		set nextSquare [Edgemost $nextSquare $testSquare]
 	    }
 	}
     }
@@ -104,13 +104,13 @@ proc MovePiece {dlg last square} {
 	if {[llength $visited] == 64} {
 	    variable initial
 	    if {$initial == $square} {
-	$dlg.f.txt insert end "Closed tour!"
+		$dlg.f.txt insert end "Closed tour!"
 	    } else {
-	$dlg.f.txt insert end "Success"
-	if {$continuous} {
-	    after [expr {$delay * 2}] [namespace code \
-	[list Tour $dlg [expr {int(rand() * 64)}]]]
-	}
+		$dlg.f.txt insert end "Success"
+		if {$continuous} {
+		    after [expr {$delay * 2}] [namespace code \
+			[list Tour $dlg [expr {int(rand() * 64)}]]]
+		}
 	    }
 	} else {
 	    $dlg.f.txt insert end "FAILED!"
@@ -195,16 +195,16 @@ proc CreateGUI {} {
     for {set row 7} {$row >= 0} {incr row -1} {
 	for {set col 0} {$col < 8} {incr col} {
 	    if {(($col & 1) ^ ($row & 1))} {
-	set fill tan3 ; set dfill tan4
+		set fill tan3 ; set dfill tan4
 	    } else {
-	set fill bisque ; set dfill bisque3
+		set fill bisque ; set dfill bisque3
 	    }
 	    set coords [list [expr {$col * 24 + 3}]p \
 			     [expr {$row * 24 + 3}]p \
-	     [expr {$col * 24 + 24}]p \
+			     [expr {$col * 24 + 24}]p \
 			     [expr {$row * 24 + 24}]p]
 	    $c create rectangle $coords -fill $fill -disabledfill $dfill \
-	-width 1.5p -state disabled -outline black
+		-width 1.5p -state disabled -outline black
 	}
     }
     if {[tk windowingsystem] ne "x11"} {