Merge trunk

1minus1is0 · 1minus1is0 · commit 1ad34cdace7e · 2025-10-12T09:34:18.000Z
diff --git a/tests/tk.test b/tests/tk.test
@@ -37,7 +37,7 @@ test tk-1.1 {tk command: general} -body {
 } -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"}
 test tk-1.2 {tk command: general} -body {
     tk xyz
-} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, print, scaling, sysnotify, systray, useinputmethods, or windowingsystem}
+} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, attribtable, busy, caret, fontchooser, inactive, print, scaling, sysnotify, systray, useinputmethods, or windowingsystem}
 
 #
 # COMMON TEST SETUP

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ test tk-1.1 {tk command: general} -body {`
`37`	`37`	`} -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"}`
`38`	`38`	`test tk-1.2 {tk command: general} -body {`
`39`	`39`	`tk xyz`
`40`		`-} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, print, scaling, sysnotify, systray, useinputmethods, or windowingsystem}`
	`40`	`+} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, attribtable, busy, caret, fontchooser, inactive, print, scaling, sysnotify, systray, useinputmethods, or windowingsystem}`
`41`	`41`
`42`	`42`	`#`
`43`	`43`	`# COMMON TEST SETUP`