summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-24 20:47:40 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-24 20:47:40 (GMT)
commit220282500becbcb9dc9124b8cca053fb6ed1a4b8 (patch)
treee1aef50a305c32bf06bd3b7b0e6f2175c7838da9
parentb726273bbea296990f6c4c7e98a213f56ce07bc5 (diff)
parente27c66d81aa3904b675aa2851d14444b44c9555e (diff)
downloadtcl-220282500becbcb9dc9124b8cca053fb6ed1a4b8.zip
tcl-220282500becbcb9dc9124b8cca053fb6ed1a4b8.tar.gz
tcl-220282500becbcb9dc9124b8cca053fb6ed1a4b8.tar.bz2
Merge 8.6
-rw-r--r--ChangeLog.20034
-rw-r--r--changes2
-rw-r--r--generic/tclBasic.c4
-rw-r--r--generic/tclCompCmds.c2
-rw-r--r--generic/tclCompCmdsSZ.c6
-rw-r--r--generic/tclEvent.c2
-rw-r--r--generic/tclExecute.c2
-rw-r--r--generic/tclFCmd.c2
-rw-r--r--generic/tclIOUtil.c2
-rw-r--r--generic/tclInterp.c2
-rw-r--r--generic/tclListObj.c2
-rw-r--r--generic/tclObj.c8
-rw-r--r--generic/tclStringObj.c4
-rw-r--r--generic/tclUtil.c2
-rw-r--r--library/clock.tcl2
-rwxr-xr-xunix/configure2
-rw-r--r--unix/configure.ac2
-rw-r--r--unix/tclUnixTime.c4
18 files changed, 27 insertions, 27 deletions
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index 3c3ee11..ec4109f 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -2331,7 +2331,7 @@
argument, the Tcl_Interp struct loses its termOffset field and the
TCL_BRACKET_TERM flag in the evalFlags field, all of which were only
used (indirectly) by Tcl_SubstObj(). Tests subst-8.7,8.8,11.4,11.5
- modified to accomodate the only behavior change: reporting of parse
+ modified to accommodate the only behavior change: reporting of parse
errors now takes precedence over [return] and [continue] exceptions.
All other behavior should remain compatible. [RFE 536831,684982] [Bug
685106]
@@ -2571,7 +2571,7 @@
2003-02-25 Don Porter <dgp@users.sourceforge.net>
* doc/pkgMkIndex.n: Modified [pkg_mkIndex] to use -nocase matching
- * library/package.tcl: of -load patterns, to better accomodate common
+ * library/package.tcl: of -load patterns, to better accommodate common
user errors due to confusion between [package names] names and [info
loaded] names.
diff --git a/changes b/changes
index 78b23ac..ecd098e 100644
--- a/changes
+++ b/changes
@@ -2486,7 +2486,7 @@ interpreter. (JL)
installing and requesting security policies, purely in Tcl code. Overloads
the package command to also allow an interpreter to "require" a policy. The
following new library commands are provided:
- tcl_safeCreateInterp -- creates a slave an initializes the
+ tcl_safeCreateInterp -- creates a slave and initializes the
policy mechanism.
tcl_safeInitInterp -- initializes an existing slave with the
policy mechanism.
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index a31bfb6..b10a338 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4048,7 +4048,7 @@ TclCleanupCommand(
* the builtin functions. Redefining a builtin function forces all
* existing code to be invalidated since that code may be compiled using
* an instruction specific to the replaced function. In addition,
- * redefioning a non-builtin function will force existing code to be
+ * redefining a non-builtin function will force existing code to be
* invalidated if the number of arguments has changed.
*
*----------------------------------------------------------------------
@@ -4060,7 +4060,7 @@ Tcl_CreateMathFunc(
Tcl_Interp *interp, /* Interpreter in which function is to be
* available. */
const char *name, /* Name of function (e.g. "sin"). */
- int numArgs, /* Nnumber of arguments required by
+ int numArgs, /* Number of arguments required by
* function. */
Tcl_ValueType *argTypes, /* Array of types acceptable for each
* argument. */
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 340efc9..e5b20a9 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -3342,7 +3342,7 @@ TclCompileFormatCmd(
* then return -1.
*
* Side effects:
- * May add an entery into the table of compiled locals.
+ * May add an entry into the table of compiled locals.
*
*----------------------------------------------------------------------
*/
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 40ad82b..80afce6 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -4076,7 +4076,7 @@ CompileAssociativeBinaryOpCmd(
if (words > 3) {
/*
* Reverse order of arguments to get precise agreement with [expr] in
- * calcuations, including roundoff errors.
+ * calculations, including roundoff errors.
*/
OP4( REVERSE, words-1);
@@ -4527,7 +4527,7 @@ TclCompileMinusOpCmd(
/*
* Reverse order of arguments to get precise agreement with [expr] in
- * calcuations, including roundoff errors.
+ * calculations, including roundoff errors.
*/
TclEmitInstInt4(INST_REVERSE, words-1, envPtr);
@@ -4571,7 +4571,7 @@ TclCompileDivOpCmd(
/*
* Reverse order of arguments to get precise agreement with [expr] in
- * calcuations, including roundoff errors.
+ * calculations, including roundoff errors.
*/
TclEmitInstInt4(INST_REVERSE, words-1, envPtr);
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 1e2e7bf..8729add 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -967,7 +967,7 @@ Tcl_Exit(
/*
* Warning: this function SHOULD NOT return, as there is code that depends
* on Tcl_Exit never returning. In fact, we will Tcl_Panic if anyone
- * returns, so critical is this dependcy.
+ * returns, so critical is this dependency.
*
* If subsystems are not (yet) initialized, proper Tcl-finalization is
* impossible, so fallback to system exit, see bug-[f8a33ce3db5d8cc2].
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index d4e9796..e8aca32 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1798,7 +1798,7 @@ TclCompileObj(
* of course).
*
* Side effects:
- * valuePtr gets the new incrmented value.
+ * valuePtr gets the new incremented value.
*
*----------------------------------------------------------------------
*/
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 2d24207..ea8f715 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -425,7 +425,7 @@ TclFileDeleteCmd(
if (result != TCL_OK) {
if (errfile == NULL) {
/*
- * We try to accomodate poor error results from our Tcl_FS calls.
+ * We try to accommodate poor error results from our Tcl_FS calls.
*/
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index ae6bc56..d1589c1 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -178,7 +178,7 @@ const Tcl_Filesystem tclNativeFilesystem = {
/*
* An initial record in the linked list for the native filesystem. Remains at
* the tail of the list and is never freed. Currently the native filesystem is
- * hard-coded. It may make sense to modify this to accomodate unconventional
+ * hard-coded. It may make sense to modify this to accommodate unconventional
* uses of Tcl that provide no native filesystem.
*/
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index ad24d28..70cf8fa 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -61,7 +61,7 @@ typedef struct Alias {
Tcl_Obj *objPtr; /* The first actual prefix object - the target
* command name; this has to be at the end of
* the structure, which will be extended to
- * accomodate the remaining objects in the
+ * accommodate the remaining objects in the
* prefix. */
} Alias;
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 3f17e90..8b683b1 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2335,7 +2335,7 @@ Tcl_ListObjReplace(
*/
/*
- * Calculate shifts if necessary to accomodate insertions.
+ * Calculate shifts if necessary to accommodate insertions.
* NOTE: all indices are relative to listObjs which is not necessarily the
* start of the ListStore storage area.
*
diff --git a/generic/tclObj.c b/generic/tclObj.c
index e496b1e..99368fe 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1039,7 +1039,7 @@ TclDbDumpActiveObjects(
*
* Called via the TclNewObj or TclDbNewObj macros when TCL_MEM_DEBUG is
* enabled. This function will initialize the members of a Tcl_Obj
- * struct. Initilization would be done inline via the TclNewObj macro
+ * struct. Initialization would be done inline via the TclNewObj macro
* when compiling without TCL_MEM_DEBUG.
*
* Results:
@@ -3590,7 +3590,7 @@ FreeBignum(
* None.
*
* Side effects:
- * The destination object receies a copy of the source object
+ * The destination object receives a copy of the source object
*
*----------------------------------------------------------------------
*/
@@ -3669,7 +3669,7 @@ UpdateStringOfBignum(
*
* Tcl_NewBignumObj --
*
- * Creates an initializes a bignum object.
+ * Creates and initializes a bignum object.
*
* Results:
* Returns the newly created object.
@@ -4681,7 +4681,7 @@ Tcl_GetCommandFromObj(
* None.
*
* Side effects:
- * The object's old internal rep is freed. It's string rep is not
+ * The object's old internal rep is freed. Its string rep is not
* changed. The refcount in the Command structure is incremented to keep
* it from being freed if the command is later deleted until
* TclNRExecuteByteCode has a chance to recognize that it was deleted.
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 322aed5..708c157 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -4560,7 +4560,7 @@ TclStringReplace(
* FillUnicodeRep --
*
* Populate the Unicode internal rep with the Unicode form of its string
- * rep. The object must alread have a "String" internal rep.
+ * rep. The object must already have a "String" internal rep.
*
* Results:
* None.
@@ -4719,7 +4719,7 @@ DupStringInternalRep(
* This operation always succeeds and returns TCL_OK.
*
* Side effects:
- * Any old internal reputation for objPtr is freed and the internal
+ * Any old internal representation for objPtr is freed and the internal
* representation is set to "String".
*
*----------------------------------------------------------------------
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 73f5cf2..3639d30 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -4075,7 +4075,7 @@ TclIndexEncode(
*/
idx = after;
} else if (wide <= (irPtr ? INT_MAX : TCL_INDEX_NONE)) {
- /* These indices always indicate "before the beginning */
+ /* These indices always indicate "before the beginning" */
idx = before;
} else {
/* Encoded end-positive (or end+negative) are offset */
diff --git a/library/clock.tcl b/library/clock.tcl
index 136ded2..118d177 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -223,7 +223,7 @@ proc ::tcl::clock::Initialize {} {
::msgcat::mcset ru GREGORIAN_CHANGE_DATE 2421639
- # Romania (Transylvania changed earler - perhaps de_RO should show the
+ # Romania (Transylvania changed earlier - perhaps de_RO should show the
# earlier date?)
::msgcat::mcset ro GREGORIAN_CHANGE_DATE 2422063
diff --git a/unix/configure b/unix/configure
index 1b9a9e0..685911b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9619,7 +9619,7 @@ fi
#--------------------------------------------------------------------
-# On some systems strstr is broken: it returns a pointer even even if
+# On some systems strstr is broken: it returns a pointer even if
# the original string is empty.
#--------------------------------------------------------------------
diff --git a/unix/configure.ac b/unix/configure.ac
index de44ed7..60e7a62 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -394,7 +394,7 @@ AC_CHECK_FUNC(memmove, , [
AC_DEFINE(NO_STRING_H, 1, [Do we have <string.h>?]) ])
#--------------------------------------------------------------------
-# On some systems strstr is broken: it returns a pointer even even if
+# On some systems strstr is broken: it returns a pointer even if
# the original string is empty.
#--------------------------------------------------------------------
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 6ca641d..f242cf4 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -132,7 +132,7 @@ TclpGetMicroseconds(void)
* TclpGetClicks --
*
* This procedure returns a value that represents the highest resolution
- * clock available on the system. There are no garantees on what the
+ * clock available on the system. There are no guarantees on what the
* resolution will be. In Tcl we will call this value a "click". The
* start time is also system dependent.
*
@@ -181,7 +181,7 @@ TclpGetClicks(void)
* TclpGetWideClicks --
*
* This procedure returns a WideInt value that represents the highest
- * resolution clock available on the system. There are no garantees on
+ * resolution clock available on the system. There are no guarantees on
* what the resolution will be. In Tcl we will call this value a "click".
* The start time is also system dependent.
*