summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog.20002
-rw-r--r--ChangeLog.20026
-rw-r--r--ChangeLog.20034
-rw-r--r--ChangeLog.20042
-rw-r--r--generic/tclBasic.c4
-rw-r--r--generic/tclEnsemble.c34
-rw-r--r--generic/tclIndexObj.c4
-rw-r--r--generic/tclInt.h4
-rw-r--r--generic/tclStringObj.c2
-rw-r--r--library/http/http.tcl2
-rw-r--r--tests/trace.test2
-rw-r--r--unix/tcl.m42
-rw-r--r--win/makefile.vc4
13 files changed, 36 insertions, 36 deletions
diff --git a/ChangeLog.2000 b/ChangeLog.2000
index 0d20eaf..5b62351 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.2000
@@ -414,7 +414,7 @@
Tcl_IsChannelExisting, and Tcl_ClearChannelHandlers to conform to the
new stacked channel implementation. Their stub slots were also moved
to give preference to the new 8.3.2 stub functions. This will cause an
- incompatability with 8.4a1 only.
+ incompatibility with 8.4a1 only.
(StopCopy): fixed a bug introduced by a partial fix in 8.3.2 that
didn't set nonBlocking correctly when resetting the flags for the
write side. [Bug: 6261]
diff --git a/ChangeLog.2002 b/ChangeLog.2002
index 30b8b17..9931657 100644
--- a/ChangeLog.2002
+++ b/ChangeLog.2002
@@ -847,7 +847,7 @@
exit.
* tests/exec.test: marked exec-18.1 unixOnly until the Windows
- incompatability (in the test, not the core) can be resolved.
+ incompatibility (in the test, not the core) can be resolved.
* tests/http.test (http-3.11): added close $fp that was causing an
error on Windows because the file was not closed before deleting.
@@ -3642,7 +3642,7 @@
* compat/strtoll.c (strtoll):
* compat/strtoull.c (strtoull):
* unix/tclUnixPort.h:
- * win/tclWinPort.h: Const-ing 64-bit compatability declarations. Note
+ * win/tclWinPort.h: Const-ing 64-bit compatibility declarations. Note
that the return pointer is non-const because it is entirely legal for
the functions to be called from somewhere that owns the string being
passed. Fixes problem reported by Larry Virden.
@@ -3779,7 +3779,7 @@
There are a lot of changes from this TIP, so please see
http://purl.org/tcl/tip/72.html for discussion of
- backward-compatability issues, but the main ones modifications are in:
+ backward-compatibility issues, but the main ones modifications are in:
* generic/tcl.h: New types.
* generic/tcl.decls: New public functions.
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index c586ba9..3c3ee11 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -947,7 +947,7 @@
declarations match and will end up using the declarations in the
public code from now on because of #include ordering. Keeping the old
declarations in tclInt.decls; there's no need to gratuitously break
- compatability for those extensions which are already clients of the
+ compatibility for those extensions which are already clients of the
namespace code.
2003-08-23 Zoran Vasiljevic <zoran@archiwrae.com>
@@ -1278,7 +1278,7 @@
* generic/tclVar.c (Tcl_ArrayObjCmd, TclArraySet): Made [array get]
and [array set] work with dictionaries, producing them and consuming
- them. Note that for compatability reasons, you will never get a dict
+ them. Note that for compatibility reasons, you will never get a dict
from feeding a string literal to [array set] since that alters the
trace behaviour of "multi-key" sets. [Bug 759935]
diff --git a/ChangeLog.2004 b/ChangeLog.2004
index 82acd5c..daf124f 100644
--- a/ChangeLog.2004
+++ b/ChangeLog.2004
@@ -1356,7 +1356,7 @@
2004-10-07 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* *.3: Convert CONST to const and VOID to void so we document how
- people should actually use the Tcl API and not the compatability hacks
+ people should actually use the Tcl API and not the compatibility hacks
that it has to have.
* doc/man.macros, *.3: Update .AS macro so it can know how wide to
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 9ee8ef7..19c9829 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -698,8 +698,8 @@ Tcl_CreateInterp(void)
*/
iPtr->ensembleRewrite.sourceObjs = NULL;
- iPtr->ensembleRewrite.numRemovedObjs1 = 0;
- iPtr->ensembleRewrite.numInsertedObjs1 = 0;
+ iPtr->ensembleRewrite.numRemovedObjs = 0;
+ iPtr->ensembleRewrite.numInsertedObjs = 0;
/*
* TIP#143: Initialise the resource limit support.
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index ecf6563..1eb1211 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -1987,16 +1987,16 @@ TclInitRewriteEnsemble(
if (isRootEnsemble) {
iPtr->ensembleRewrite.sourceObjs = objv;
- iPtr->ensembleRewrite.numRemovedObjs1 = numRemoved;
- iPtr->ensembleRewrite.numInsertedObjs1 = numInserted;
+ iPtr->ensembleRewrite.numRemovedObjs = numRemoved;
+ iPtr->ensembleRewrite.numInsertedObjs = numInserted;
} else {
- size_t numIns = iPtr->ensembleRewrite.numInsertedObjs1;
+ size_t numIns = iPtr->ensembleRewrite.numInsertedObjs;
if (numIns < numRemoved) {
- iPtr->ensembleRewrite.numRemovedObjs1 += numRemoved - numIns;
- iPtr->ensembleRewrite.numInsertedObjs1 = numInserted;
+ iPtr->ensembleRewrite.numRemovedObjs += numRemoved - numIns;
+ iPtr->ensembleRewrite.numInsertedObjs = numInserted;
} else {
- iPtr->ensembleRewrite.numInsertedObjs1 += numInserted - numRemoved;
+ iPtr->ensembleRewrite.numInsertedObjs += numInserted - numRemoved;
}
}
return isRootEnsemble;
@@ -2029,8 +2029,8 @@ TclResetRewriteEnsemble(
if (isRootEnsemble) {
iPtr->ensembleRewrite.sourceObjs = NULL;
- iPtr->ensembleRewrite.numRemovedObjs1 = 0;
- iPtr->ensembleRewrite.numInsertedObjs1 = 0;
+ iPtr->ensembleRewrite.numRemovedObjs = 0;
+ iPtr->ensembleRewrite.numInsertedObjs = 0;
}
}
@@ -2081,14 +2081,14 @@ TclSpellFix(
if (iPtr->ensembleRewrite.sourceObjs == NULL) {
iPtr->ensembleRewrite.sourceObjs = objv;
- iPtr->ensembleRewrite.numRemovedObjs1 = 0;
- iPtr->ensembleRewrite.numInsertedObjs1 = 0;
+ iPtr->ensembleRewrite.numRemovedObjs = 0;
+ iPtr->ensembleRewrite.numInsertedObjs = 0;
}
/* Compute the valid length of the ensemble root */
- size = iPtr->ensembleRewrite.numRemovedObjs1 + objc
- - iPtr->ensembleRewrite.numInsertedObjs1;
+ size = iPtr->ensembleRewrite.numRemovedObjs + objc
+ - iPtr->ensembleRewrite.numInsertedObjs;
search = iPtr->ensembleRewrite.sourceObjs;
if (search[0] == NULL) {
@@ -2096,7 +2096,7 @@ TclSpellFix(
search = (Tcl_Obj *const *) search[1];
}
- if (badIdx < iPtr->ensembleRewrite.numInsertedObjs1) {
+ if (badIdx < iPtr->ensembleRewrite.numInsertedObjs) {
/*
* Misspelled value was inserted. We cannot directly jump
* to the bad value, but have to search.
@@ -2113,8 +2113,8 @@ TclSpellFix(
}
} else {
/* Jump to the misspelled value. */
- idx = iPtr->ensembleRewrite.numRemovedObjs1 + badIdx
- - iPtr->ensembleRewrite.numInsertedObjs1;
+ idx = iPtr->ensembleRewrite.numRemovedObjs + badIdx
+ - iPtr->ensembleRewrite.numInsertedObjs;
/* Verify */
if (search[idx] != bad) {
@@ -2169,8 +2169,8 @@ TclFetchEnsembleRoot(
Interp *iPtr = (Interp *) interp;
if (iPtr->ensembleRewrite.sourceObjs) {
- *objcPtr = objc + iPtr->ensembleRewrite.numRemovedObjs1
- - iPtr->ensembleRewrite.numInsertedObjs1;
+ *objcPtr = objc + iPtr->ensembleRewrite.numRemovedObjs
+ - iPtr->ensembleRewrite.numInsertedObjs;
return iPtr->ensembleRewrite.sourceObjs;
}
*objcPtr = objc;
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index be41547..5e1478d 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -832,8 +832,8 @@ Tcl_WrongNumArgs(
*/
if (iPtr->ensembleRewrite.sourceObjs != NULL) {
- size_t toSkip = iPtr->ensembleRewrite.numInsertedObjs1;
- size_t toPrint = iPtr->ensembleRewrite.numRemovedObjs1;
+ size_t toSkip = iPtr->ensembleRewrite.numInsertedObjs;
+ size_t toPrint = iPtr->ensembleRewrite.numRemovedObjs;
Tcl_Obj *const *origObjv = iPtr->ensembleRewrite.sourceObjs;
/*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 9b166ce..0f286a5 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1964,9 +1964,9 @@ typedef struct Interp {
* *root* ensemble command? (Nested ensembles
* don't rewrite this.) NULL if we're not
* processing an ensemble. */
- size_t numRemovedObjs1; /* How many arguments have been stripped off
+ size_t numRemovedObjs; /* How many arguments have been stripped off
* because of ensemble processing. */
- size_t numInsertedObjs1; /* How many of the current arguments were
+ size_t numInsertedObjs; /* How many of the current arguments were
* inserted by an ensemble. */
} ensembleRewrite;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 1fc0aa5..6be782c 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2898,7 +2898,7 @@ TclStringCatObjv(
* Broken interface! Byte array value routines offer no way
* to handle failure to allocate enough space. Following
* stanza may panic.
- */
+ */
if (inPlace && !Tcl_IsShared(*objv)) {
int start;
diff --git a/library/http/http.tcl b/library/http/http.tcl
index d105886..ccd4cd1 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1447,7 +1447,7 @@ proc http::mapReply {string} {
set converted [string map $formMap $string]
if {[string match "*\[\u0100-\uffff\]*" $converted]} {
regexp "\[\u0100-\uffff\]" $converted badChar
- # Return this error message for maximum compatability... :^/
+ # Return this error message for maximum compatibility... :^/
return -code error \
"can't read \"formMap($badChar)\": no such element in array"
}
diff --git a/tests/trace.test b/tests/trace.test
index 3b69d38..720c870 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -1265,7 +1265,7 @@ test trace-18.4 {namespace delete / trace vdelete combo, Bug \#1338280} {
} 1110
test trace-18.5 {Bug 7f02ff1efa} -setup {
proc constant {name value} {
- upvar 1 $name c
+ upvar 1 $name c
set c $value
trace variable c wu [list reset $value]
}
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index e0b7771..c1d7a7d 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2706,7 +2706,7 @@ AC_DEFUN([SC_TCL_CFG_ENCODING], [
# advancedTest - the advanced test to run if the function is present
#
# Results:
-# Might cause compatability versions of the function to be used.
+# Might cause compatibility versions of the function to be used.
# Might affect the following vars:
# USE_COMPAT (implicit)
#
diff --git a/win/makefile.vc b/win/makefile.vc
index 6340e45..3a60369 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -113,12 +113,12 @@ the build instructions.
# memdbg = Enables the debugging memory allocator.
#
# CHECKS=64bit,fullwarn,nodep,none
-# Sets special macros for checking compatability.
+# Sets special macros for checking compatibility.
#
# 64bit = Enable 64bit portability warnings (if available)
# fullwarn = Builds with full compiler and link warnings enabled.
# Very verbose.
-# nodep = Turns off compatability macros to ensure the core
+# nodep = Turns off compatibility macros to ensure the core
# isn't being built with deprecated functions.
#
# MACHINE=(ALPHA|AMD64|IA64|IX86)
generated by cgit v0.12 at 2025-12-25 19:47:01 (GMT)