diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-16 14:31:47 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-16 14:31:47 (GMT) |
commit | 94754be1d71be6bdfa22ad051efd79e0c7a93824 (patch) | |
tree | 6c9e9a4249624be65af9b86f56ebc81bf0e1fea0 | |
parent | 6168d91b0ee4f13f66e4d74b189caee52f9487da (diff) | |
parent | 0f0ca3d9323a2e8dd54a6a0e11a0f9fc5467cfd8 (diff) | |
download | tcl-94754be1d71be6bdfa22ad051efd79e0c7a93824.zip tcl-94754be1d71be6bdfa22ad051efd79e0c7a93824.tar.gz tcl-94754be1d71be6bdfa22ad051efd79e0c7a93824.tar.bz2 |
merge core-8-6-branch
-rw-r--r-- | doc/dict.n | 2 | ||||
-rw-r--r-- | generic/tcl.h | 2 | ||||
-rw-r--r-- | generic/tclStrToD.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 && |