summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-09-04 12:38:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-09-04 12:38:14 (GMT)
commitdba280d1b84eae2c164b1c0991e1b0795e290b8e (patch)
treebf4e292011c6d5f9a6079301365134c62e166bbc
parent440482d40ff244dfd5de9fbd2cb3af8dd79c56cd (diff)
parent00deed9129815de66856273e30bc92649e6c111b (diff)
downloadtcl-dba280d1b84eae2c164b1c0991e1b0795e290b8e.zip
tcl-dba280d1b84eae2c164b1c0991e1b0795e290b8e.tar.gz
tcl-dba280d1b84eae2c164b1c0991e1b0795e290b8e.tar.bz2
merge core-8-6-branch
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclEncoding.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 1fbbbeb..cceef45 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -2108,7 +2108,7 @@ Tcl_CreateCommand(
/* An existing command conflicts. Try to delete it.. */
cmdPtr = Tcl_GetHashValue(hPtr);
-
+
/*
* Be careful to preserve
* any existing import links so we can restore them down below. That
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d430b32..e328340 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2329,7 +2329,7 @@ UtfToUtfProc(
}
if (UCHAR(*src) < 0x80 && !(UCHAR(*src) == 0 && pureNullMode == 0)) {
/*
- * Copy 7bit chatacters, but skip null-bytes when we are in input
+ * Copy 7bit characters, but skip null-bytes when we are in input
* mode, so that they get converted to 0xc080.
*/
@@ -3380,7 +3380,7 @@ EscapeFromUtfProc(
/*
* The state variable has the value of oldState when word is 0.
- * In this case, the escape sequense should not be copied to dst
+ * In this case, the escape sequence should not be copied to dst
* because the current character set is not changed.
*/