summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-02-16 14:48:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-02-16 14:48:23 (GMT)
commitfdd6e10be7839ade63b17abcd43997e745c65ae6 (patch)
treec7f3ab4f546d6c4288723baf71a82078f24f260c
parent4ecd9f7eaa31f72507645c0f692afce5f90cf2cd (diff)
parentfe87d877dda78ee0e19ad6860c70c0d46924dd21 (diff)
downloadtcl-fdd6e10be7839ade63b17abcd43997e745c65ae6.zip
tcl-fdd6e10be7839ade63b17abcd43997e745c65ae6.tar.gz
tcl-fdd6e10be7839ade63b17abcd43997e745c65ae6.tar.bz2
Merge 8.6
-rw-r--r--doc/ParseCmd.32
-rw-r--r--generic/tclNotify.c2
-rw-r--r--generic/tclPkg.c2
-rw-r--r--tests/cmdMZ.test2
-rw-r--r--tests/nre.test2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/ParseCmd.3 b/doc/ParseCmd.3
index 03b97f7..d413315 100644
--- a/doc/ParseCmd.3
+++ b/doc/ParseCmd.3
@@ -159,7 +159,7 @@ occurs while parsing the command then \fBTCL_ERROR\fR is returned, an
error message is left in \fIinterp\fR's result (if \fIinterp\fR is not
NULL), and no information is left at \fI*parsePtr\fR.
.PP
-\fBTcl_ParseVar\fR parse a Tcl variable reference such as \fB$abc\fR
+\fBTcl_ParseVar\fR parses a Tcl variable reference such as \fB$abc\fR
or \fB$x([expr {$index + 1}])\fR from the beginning of its \fIstart\fR
argument. The first character of \fIstart\fR must be \fB$\fR. If
the variable name is parsed successfully, \fBTcl_ParseVar\fR returns a
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index e511fa1..c724157 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -1080,7 +1080,7 @@ Tcl_ServiceAll(void)
}
/*
- * We need to turn off event servicing like we to in Tcl_DoOneEvent, to
+ * We need to turn off event servicing like we do in Tcl_DoOneEvent, to
* avoid recursive calls.
*/
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index b5b5582..55e09a2 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -1671,7 +1671,7 @@ CheckVersionAndConvert(
int hasunstable = 0;
/*
* 4* assuming that each char is a separator (a,b become ' -x ').
- * 4+ to have spce for an additional -2 at the end
+ * 4+ to have space for an additional -2 at the end
*/
char *ibuf = (char *)ckalloc(4 + 4*strlen(string));
char *ip = ibuf;
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index 89947bb..da7ce5c 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -401,7 +401,7 @@ test cmdMZ-6.5a {Tcl_TimeRateObjCmd: result format and one iteration} {
test cmdMZ-6.5b {Tcl_TimeRateObjCmd: result format without iterations} {
regexp {^0 \ws/# 0 # 0 #/sec 0 net-ms$} [timerate {} 0 0]
} 1
-test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measument} -body {
+test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measurement} -body {
set m1 [timerate {_nrt_sleep 0.01} 50]
set m2 [timerate {_nrt_sleep 1.00} 50]
list [list \
diff --git a/tests/nre.test b/tests/nre.test
index 8296569..357f120 100644
--- a/tests/nre.test
+++ b/tests/nre.test
@@ -1,4 +1,4 @@
-# Commands covered: proc, apply, [interp alias], [namespce import]
+# Commands covered: proc, apply, [interp alias], [namespace import]
#
# This file contains a collection of tests for the non-recursive executor that
# avoids recursive calls to TEBC. Only the NRE behaviour is tested here, the