summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-06-16 14:31:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-06-16 14:31:47 (GMT)
commitfafe9a283fd31baef4c4c0ea42826dac9d6ae2c9 (patch)
tree6c9e9a4249624be65af9b86f56ebc81bf0e1fea0
parenta57504b7697df8a915b8c57183ec18c2068b53dd (diff)
parentf7860f65a494888a46e377831ba0419de5f364d9 (diff)
downloadtcl-fafe9a283fd31baef4c4c0ea42826dac9d6ae2c9.zip
tcl-fafe9a283fd31baef4c4c0ea42826dac9d6ae2c9.tar.gz
tcl-fafe9a283fd31baef4c4c0ea42826dac9d6ae2c9.tar.bz2
merge core-8-6-branch
-rw-r--r--doc/dict.n2
-rw-r--r--generic/tcl.h2
-rw-r--r--generic/tclStrToD.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/dict.n b/doc/dict.n
index fecad85..cd7e94c 100644
--- a/doc/dict.n
+++ b/doc/dict.n
@@ -437,7 +437,7 @@ puts $foo
# prints: \fIa b foo {a b} bar 2 baz 3\fR
.CE
.SH "SEE ALSO"
-append(n), array(n), foreach(n), mapeach(n), incr(n), list(n), lappend(n), set(n)
+append(n), array(n), foreach(n), incr(n), list(n), lappend(n), lmap(n), set(n)
.SH KEYWORDS
dictionary, create, update, lookup, iterate, filter, map
'\" Local Variables:
diff --git a/generic/tcl.h b/generic/tcl.h
index 759f824..903a8be 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2209,7 +2209,7 @@ typedef struct Tcl_EncodingType {
*/
#ifndef TCL_UTF_MAX
-#define TCL_UTF_MAX 3
+#define TCL_UTF_MAX 4
#endif
/*
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 67b6482..2091928 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1183,9 +1183,9 @@ TclParseNumber(
case sNA:
case sNANPAREN:
case sNANHEX:
+#endif
Tcl_Panic("TclParseNumber: bad acceptState %d parsing '%s'",
acceptState, bytes);
-#endif
case BINARY:
shift = numTrailZeros;
if (!significandOverflow && significandWide != 0 &&