From 4874c0a0af9a15df8fc4b0994370a5d44fda5e44 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 29 Aug 2013 20:08:04 +0000
Subject: Bump to 8.5.15 for release.

---
 ChangeLog         | 13 +++++++++++++
 README            |  2 +-
 generic/tcl.h     |  4 ++--
 library/init.tcl  |  2 +-
 tools/tcl.wse.in  |  2 +-
 unix/configure    |  2 +-
 unix/configure.in |  2 +-
 unix/tcl.spec     |  2 +-
 win/configure     |  2 +-
 win/configure.in  |  2 +-
 10 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02472fe..032bfc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-03  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tcl.h:	Bump to 8.5.15 for release.
+	* library/init.tcl:
+	* tools/tcl.wse.in:
+	* unix/configure.in:
+	* unix/tcl.spec:
+	* win/configure.in:
+	* README:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
 2013-08-01  Harald Oehlmann  <oehhar@users.sf.net>
 
 	* tclUnixNotify.c Tcl_InitNotifier: Bug [a0bc856dcd]
diff --git a/README b/README
index 0b3cf05..2ad171f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.5.14 source distribution.
+    This is the Tcl 8.5.15 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tcl from the URL above.
 
diff --git a/generic/tcl.h b/generic/tcl.h
index be5e697..eeff36e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -58,10 +58,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   5
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  14
+#define TCL_RELEASE_SERIAL  15
 
 #define TCL_VERSION	    "8.5"
-#define TCL_PATCH_LEVEL	    "8.5.14"
+#define TCL_PATCH_LEVEL	    "8.5.15"
 
 /*
  * The following definitions set up the proper options for Windows compilers.
diff --git a/library/init.tcl b/library/init.tcl
index 071e6df..6b49fdf 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -16,7 +16,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.5.14
+package require -exact Tcl 8.5.15
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index aac4413..e22b74a 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.5.14
+  Disk Label=tcl8.5.15
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
diff --git a/unix/configure b/unix/configure
index 217e5d4..d7bd53b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1335,7 +1335,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".14"
+TCL_PATCH_LEVEL=".15"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 37de8be..b5a09dd 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".14"
+TCL_PATCH_LEVEL=".15"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index f7705fd..b61f4bf 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.5.14
+Version:       8.5.15
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index a1c0f6d..a0be0c4 100755
--- a/win/configure
+++ b/win/configure
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".14"
+TCL_PATCH_LEVEL=".15"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/configure.in b/win/configure.in
index 33bf784..ea25843 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".14"
+TCL_PATCH_LEVEL=".15"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
-- 
cgit v0.12


From d3fcbfab11472daf6c82fb0ecdecfa136a310cbe Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 30 Aug 2013 14:16:05 +0000
Subject: changes

---
 changes | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/changes b/changes
index 78ade0e..2221400 100644
--- a/changes
+++ b/changes
@@ -7735,6 +7735,49 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 --- Released 8.5.14, April 3, 2013 --- See ChangeLog for details ---
 
-2013-05-08 (bug fix)[3036566] Honor language packs on Vista+ to get initial locale (oehlmann)
+2013-04-03 (bug fix)[3205320] outsmart gcc on powerpc detect stack direction
+
+2013-04-04 (bug fix) Support URLs with query but no path (max)
+=> http 2.7.12
+
+2013-04-08 (bug fix)[3610026] regexp crash on color overflow (linnakangas)
+
+2013-04-16 (bug fix)[3610404] crash in enter traces (found with TclOO) (porter)
+
+2013-04-30 (enhancement) broaden glibc version detection (kupries)
+=> platform 1.0.12
+
+2013-05-01 (bug fix)[2901998] inconsistent I/O buffering (ferrieux)
+
+2013-05-06 (platform support) Cygwin64 (nijtmans)
+
+2013-05-16 (platform support) mingw-4.0 (nijtmans)
+
+2013-05-19 (platform support) FreeBSD updates (cerutti)
+
+2013-05-22 (bug fix)[3613609] [lsort -nocase] failed on non-ASCII (fellows)
+
+2013-05-28 (bug fix)[3036566] Use language packs (Vista+) locale (oehlmann)
 => msgcat 1.5.2
 
+2013-06-03 Restored lost performance appending to long strings (elby,porter)
+
+2013-06-17 (bug fix)[a876646] [:cntrl:] includes \x00 to \x1f (nijtmans)
+
+2013-06-17 [string is space \u180e] => 1 (nijtmans)
+
+2013-06-27 (bug fix)[983509] missing encodings for config values (nijtmans)
+
+2013-06-27 (bug fix)[32afa6] corrected dirent64 check (griffin)
+
+2013-07-06 tzdata updated to Olson's tzdata2013d (kenny)
+
+2013-07-26 (bug fix)[6585b2] regexp {(\w).*?\1} abb (lane)
+
+2013-07-29 [string is space \u202f] => 1 (nijtmans)
+
+2013-08-01 [a0bc85] Limited support for fork with threads (for Rivet) (nijtmans)
+
+2013-08-15 Errors from execution traces become errors of the command (porter)
+
+--- Released 8.5.15, September 16, 2013 --- See ChangeLog for details ---
-- 
cgit v0.12


From f9d0c02e5020b9f06c1ba46c1e5820b35fe2ff8b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 30 Aug 2013 14:31:06 +0000
Subject: fix date

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 032bfc7..fca182b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2013-04-03  Don Porter  <dgp@users.sourceforge.net>
+2013-08-30  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tcl.h:	Bump to 8.5.15 for release.
 	* library/init.tcl:
-- 
cgit v0.12


From 9ff2704ae65ba49830398d9835492af591a7a0f3 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 3 Sep 2013 16:04:06 +0000
Subject: some missed changes

---
 changes | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes b/changes
index 2221400..ba7ce74 100644
--- a/changes
+++ b/changes
@@ -7768,7 +7768,9 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2013-06-27 (bug fix)[983509] missing encodings for config values (nijtmans)
 
-2013-06-27 (bug fix)[32afa6] corrected dirent64 check (griffin)
+2013-06-27 (bug fix)[34538b] apply DST in 2099 (lang)
+
+2013-07-02 (bug fix)[32afa6] corrected dirent64 check (griffin)
 
 2013-07-06 tzdata updated to Olson's tzdata2013d (kenny)
 
@@ -7778,6 +7780,8 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2013-08-01 [a0bc85] Limited support for fork with threads (for Rivet) (nijtmans)
 
+2013-08-14 (bug fix)[a16752] Missing command delete callbacks (porter)
+
 2013-08-15 Errors from execution traces become errors of the command (porter)
 
 --- Released 8.5.15, September 16, 2013 --- See ChangeLog for details ---
-- 
cgit v0.12


From 89d7d04dbc30e04aabc39806f925f51a835889fd Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 3 Sep 2013 16:45:56 +0000
Subject: Favor timeline over ChangeLog

---
 changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes b/changes
index ba7ce74..c51ff93 100644
--- a/changes
+++ b/changes
@@ -7784,4 +7784,4 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2013-08-15 Errors from execution traces become errors of the command (porter)
 
---- Released 8.5.15, September 16, 2013 --- See ChangeLog for details ---
+--- Released 8.5.15, September 16, 2013 --- http://core.tcl.tk/tcl/ for details
-- 
cgit v0.12


From 55f663e53f501bf7c9748ad6a70d148b41a83b2b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 13 Sep 2013 16:02:11 +0000
Subject: Added note to ChangeLog pointing to the fossil timeline for better
 logging.

---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fca182b..fd8c7c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+A NOTE ON THE CHANGELOG:
+Starting in early 2011, Tcl source code has been under the management of
+fossil, hosted at http://core.tcl.tk/tcl/ .  Fossil presents a "Timeline"
+view of changes made that is superior in every way to a hand edited log file.
+Because of this, many Tcl developers are now out of the habit of maintaining
+this log file.  You may still find useful things in it, but the Timeline is
+a better first place to look now.
+============================================================================
+
 2013-08-30  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tcl.h:	Bump to 8.5.15 for release.
-- 
cgit v0.12


From a57f75c197b1d3371c96802a894b9a85d84f2632 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 19 Sep 2013 04:03:57 +0000
Subject: [3487626] Backport fix for knownBug test dict-23.2.

---
 generic/tclCompCmds.c | 7 +++++++
 tests/dict.test       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index b6e9527..f96470d 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -6149,6 +6149,7 @@ TclCompileEnsemble(
     Tcl_Parse synthetic;
     int len, numBytes, result, flags = 0, i;
     const char *word;
+    DefineLineInformation;
 
     if (parsePtr->numWords < 2) {
 	return TCL_ERROR;
@@ -6388,8 +6389,14 @@ TclCompileEnsemble(
      * Hand off compilation to the subcommand compiler. At last!
      */
 
+    mapPtr->loc[eclIndex].line++;
+    mapPtr->loc[eclIndex].next++;
+
     result = cmdPtr->compileProc(interp, &synthetic, cmdPtr, envPtr);
 
+    mapPtr->loc[eclIndex].line--;
+    mapPtr->loc[eclIndex].next--;
+
     /*
      * Clean up if necessary.
      */
diff --git a/tests/dict.test b/tests/dict.test
index b92893e..a673957 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -1212,7 +1212,7 @@ test dict-23.1 {dict compilation crash: Bug 3487626} {
 	}
     }} [linenumber]
 } 5
-test dict-23.2 {dict compilation crash: Bug 3487626} knownBug {
+test dict-23.2 {dict compilation crash: Bug 3487626} {
     # Something isn't quite right in line number and continuation line
     # tracking; at time of writing, this test produces 7, not 5, which
     # indicates that the extra newlines in the non-script argument are
-- 
cgit v0.12


From 6ad8909af3c178fac395992cd972c98270bf2e3c Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 19 Sep 2013 04:20:53 +0000
Subject: Stop segfault due to OBOE in CompileWord() calls in [dict lappend]
 compiler.

---
 generic/tclCompCmds.c | 4 ++--
 tests/dict.test       | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index f96470d..fa4762d 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -1313,8 +1313,8 @@ TclCompileDictLappendCmd(
 	return TCL_ERROR;
     }
     dictVarIndex = TclFindCompiledLocal(name, nameChars, 1, procPtr);
-    CompileWord(envPtr, keyTokenPtr, interp, 3);
-    CompileWord(envPtr, valueTokenPtr, interp, 4);
+    CompileWord(envPtr, keyTokenPtr, interp, 2);
+    CompileWord(envPtr, valueTokenPtr, interp, 3);
     TclEmitInstInt4( INST_DICT_LAPPEND, dictVarIndex, envPtr);
     return TCL_OK;
 }
diff --git a/tests/dict.test b/tests/dict.test
index a673957..6271779 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -1243,6 +1243,12 @@ j
 	}
     }} [linenumber]
 } 5
+test dict-23.3 {CompileWord OBOE} {
+    # segfault when buggy
+    apply {{} {tcl::dict::lappend foo bar \
+	[format baz]}}
+} {bar baz}
+
 rename linenumber {}
 
 # cleanup
-- 
cgit v0.12