diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-11 07:41:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-11 07:41:02 (GMT) |
| commit | 97517231762b52b45e2b65d03dc8a5cdf2ed6fa3 (patch) | |
| tree | ff6741c7f31bc195e9fbca048e43b01ade99608c /generic | |
| parent | 4e395367ed068227c36e2c69660993d483a52e7b (diff) | |
| parent | 429a4171cb6436a84c7923dcac6ef6fe3460ce20 (diff) | |
| download | tcl-97517231762b52b45e2b65d03dc8a5cdf2ed6fa3.zip tcl-97517231762b52b45e2b65d03dc8a5cdf2ed6fa3.tar.gz tcl-97517231762b52b45e2b65d03dc8a5cdf2ed6fa3.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCmdIL.c | 4 | ||||
| -rw-r--r-- | generic/tclFileName.c | 2 | ||||
| -rw-r--r-- | generic/tclUtf.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 7938088..60331f5 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -3640,11 +3640,11 @@ Tcl_LsearchObjCmd( /* * Normally, binary search is written to stop when it finds a * match. If there are duplicates of an element in the list, - * our first match might not be the first occurance. + * our first match might not be the first occurrence. * Consider: 0 0 0 1 1 1 2 2 2 * * To maintain consistancy with standard lsearch semantics, we - * must find the leftmost occurance of the pattern in the + * must find the leftmost occurrence of the pattern in the * list. Thus we don't just stop searching here. This * variation means that a search always makes log n * comparisons (normal binary search might "get lucky" with an diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 32b217f..5705a11 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -2055,7 +2055,7 @@ TclGlob( * SkipToChar -- * * This function traverses a glob pattern looking for the next unquoted - * occurance of the specified character at the same braces nesting level. + * occurrence of the specified character at the same braces nesting level. * * Results: * Updates stringPtr to point to the matching character, or to the end of diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 5951f68..eb10878 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -847,7 +847,7 @@ Tcl_NumUtfChars( src += TclUtfToUniChar(src, &ch); } else { /* - * src points to incomplete UTF-8 sequence + * src points to incomplete UTF-8 sequence * Treat first byte as character and count it */ src++; @@ -863,7 +863,7 @@ Tcl_NumUtfChars( * * Tcl_UtfFindFirst -- * - * Returns a pointer to the first occurance of the given Unicode character + * Returns a pointer to the first occurrence of the given Unicode character * in the NULL-terminated UTF-8 string. The NULL terminator is considered * part of the UTF-8 string. Equivalent to Plan 9 utfrune(). * @@ -900,7 +900,7 @@ Tcl_UtfFindFirst( * * Tcl_UtfFindLast -- * - * Returns a pointer to the last occurance of the given Unicode character + * Returns a pointer to the last occurrence of the given Unicode character * in the NULL-terminated UTF-8 string. The NULL terminator is considered * part of the UTF-8 string. Equivalent to Plan 9 utfrrune(). * |