summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-06 12:02:33 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-06 12:02:33 (GMT)
commitbdbd34625bfa70bd5b6a3abbf16409e7b600926d (patch)
tree73d8a7b125babe4dff912a92ea0fcb29acc2ef41
parentf574e8789221eb4b0605558d910d72503c25da69 (diff)
parent9ec7e406cfc5b15bbe46a81a3545596f60c6acd9 (diff)
downloadtcl-bdbd34625bfa70bd5b6a3abbf16409e7b600926d.zip
tcl-bdbd34625bfa70bd5b6a3abbf16409e7b600926d.tar.gz
tcl-bdbd34625bfa70bd5b6a3abbf16409e7b600926d.tar.bz2
merge trunk
-rw-r--r--changes12
-rw-r--r--doc/trace.n2
-rw-r--r--generic/tclInt.h2
3 files changed, 11 insertions, 5 deletions
diff --git a/changes b/changes
index 1430f8c..06b2db1 100644
--- a/changes
+++ b/changes
@@ -8023,8 +8023,6 @@ like "nano()" instead of parsing as "nan o()" with missing op (duquette,porter)
2012-02-02 (bug fix)[2974459,2879351,1951574,1852572,1661378,1613456] Fix
problems where [file *able] would return false results on Win/Samba (porter)
-2012-02-02 (update)[3464401] Support Unicode 6.1 (nijtmans)
-
2012-02-06 (bug fix)[3484621] bump bytecode epoch on exec traces (kuhn,sofer)
2012-02-15 (bug fix)[3487626] crash compiling [dict for] (fellows)
@@ -8105,6 +8103,14 @@ and Tcl_FSMountsChanged(). (porter)
2012-07-25 (bug fix)[3546275] [auto_execok] search match [exec] (danckaert)
+2012-07-27 (update)[3464401] Support Unicode 6.2 (nijtmans)
+
+2012-08-20 (bug fix)[3559678] [file normalize] EIAS failure (phao,dgp)
+
+2012-08-25 (bug fix)[3561330] Ukranian translation of "March" (teterin)
+
Many revisions to better support a Cygwin environment (nijtmans)
---- Released 8.6b3, July 30, 2012 --- See ChangeLog for details ---
+Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
+
+--- Released 8.6b3, September 7, 2012 --- See ChangeLog for details ---
diff --git a/doc/trace.n b/doc/trace.n
index 940a1e9..63ed1cb 100644
--- a/doc/trace.n
+++ b/doc/trace.n
@@ -143,7 +143,7 @@ error will occur.
For \fBleave\fR and \fBleavestep\fR operations:
.PP
.CS
-\fIcommand command-string code result op\fR
+\fIcommandPrefix command-string code result op\fR
.CE
.PP
\fICommand-string\fR gives the complete current command being
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 53a88d6..1c10695 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4636,7 +4636,7 @@ void Tcl_Panic(const char *, ...) __attribute__((analyzer_noreturn));
*----------------------------------------------------------------
*/
-#define NRE_USE_SMALL_ALLOC 1 /* Only turn off for debugging purposes. */
+#define NRE_USE_SMALL_ALLOC 0 /* Only turn off for debugging purposes. */
#define NRE_ENABLE_ASSERTS 1
/*