summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-03-04 14:50:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-03-04 14:50:02 (GMT)
commit77feb5ddb33bff5aa0b381ac655cb2de17a234c8 (patch)
tree0a93f45f81fda797ed4ec46354c374af18286031
parent58ca4dcdb9e8b0bf1508f67eac49a1e8da0ef1d9 (diff)
parentfe9e0b0a76210e056fd4ebbf7643b07278091539 (diff)
downloadtcl-77feb5ddb33bff5aa0b381ac655cb2de17a234c8.zip
tcl-77feb5ddb33bff5aa0b381ac655cb2de17a234c8.tar.gz
tcl-77feb5ddb33bff5aa0b381ac655cb2de17a234c8.tar.bz2
Merge 8.7
-rw-r--r--library/clock.tcl6
-rw-r--r--tests/clock.test2
2 files changed, 4 insertions, 4 deletions
diff --git a/library/clock.tcl b/library/clock.tcl
index 9d41b80..ee84b83 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -1230,8 +1230,8 @@ proc ::tcl::clock::scan { args } {
default {
return -code error \
-errorcode [list CLOCK badOption $flag] \
- "bad option \"$flag\",\
- must be -base, -format, -gmt, -locale or -timezone"
+ "bad option \"$flag\":\
+ must be -base, -format, -gmt, -locale, or -timezone"
}
}
}
@@ -4277,7 +4277,7 @@ proc ::tcl::clock::add { clockval args } {
}
default {
throw [list CLOCK badOption $a] \
- "bad option \"$a\",\
+ "bad option \"$a\":\
must be -gmt, -locale or -timezone"
}
}
diff --git a/tests/clock.test b/tests/clock.test
index 7bcc002..189b83a 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -35634,7 +35634,7 @@ test clock-34.8 {clock scan tests} {
} {Oct 23,1992 15:00 GMT}
test clock-34.9 {clock scan tests} {
list [catch {clock scan "Jan 12" -bad arg} msg] $msg
-} {1 {bad option "-bad", must be -base, -format, -gmt, -locale or -timezone}}
+} {1 {bad option "-bad": must be -base, -format, -gmt, -locale, or -timezone}}
# The following two two tests test the two year date policy
test clock-34.10 {clock scan tests} {
set time [clock scan "1/1/71" -gmt true]